From 206cdcf1c3cd12c7bf28f41f563a8ea33c76d38d Mon Sep 17 00:00:00 2001
From: Dale Hawkins <107309+dkhawk@users.noreply.github.com>
Date: Tue, 17 Sep 2024 15:54:35 -0600
Subject: [PATCH] fix: Exports sample activities so they can be run directly
 (#1808)

* fix: Exports all of the sample activities to make them available to run directly.

* fix: wrap before copyright comment formatting character
---
 .../java/app/src/main/AndroidManifest.xml     |  50 ++++-
 .../kotlin/app/src/main/AndroidManifest.xml   | 186 +++++++++++++-----
 2 files changed, 180 insertions(+), 56 deletions(-)

diff --git a/ApiDemos/java/app/src/main/AndroidManifest.xml b/ApiDemos/java/app/src/main/AndroidManifest.xml
index ebf64990..c7b33001 100644
--- a/ApiDemos/java/app/src/main/AndroidManifest.xml
+++ b/ApiDemos/java/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-  -->
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!--
@@ -49,7 +49,8 @@ limitations under the License.
             android:name="com.google.android.geo.API_KEY"
             android:value="${MAPS_API_KEY}" />
 
-        <activity android:name=".MainActivity"
+        <activity
+            android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -58,126 +59,167 @@ limitations under the License.
         </activity>
         <activity
             android:name=".AdvancedMarkersDemoActivity"
+            android:exported="true"
             android:label="@string/advanced_markers_demo_label" />
         <activity
             android:name=".BasicMapDemoActivity"
+            android:exported="true"
             android:label="@string/basic_map_demo_label" />
         <activity
             android:name=".BackgroundColorCustomizationDemoActivity"
-            android:label="@string/background_color_customization_demo_label"/>
+            android:exported="true"
+            android:label="@string/background_color_customization_demo_label" />
         <activity
             android:name=".BackgroundColorCustomizationProgrammaticDemoActivity"
-            android:label="@string/background_color_customization_programmatic_demo_label"/>
+            android:exported="true"
+            android:label="@string/background_color_customization_programmatic_demo_label" />
         <activity
             android:name=".CameraDemoActivity"
+            android:exported="true"
             android:label="@string/camera_demo_label" />
         <activity
             android:name=".CameraClampingDemoActivity"
+            android:exported="true"
             android:label="@string/camera_clamping_demo_label" />
         <activity
             android:name=".CloudBasedMapStylingDemoActivity"
+            android:exported="true"
             android:label="@string/cloud_styling_label" />
         <activity
             android:name=".CircleDemoActivity"
+            android:exported="true"
             android:label="@string/circle_demo_label" />
         <activity
             android:name=".EventsDemoActivity"
+            android:exported="true"
             android:label="@string/events_demo_label" />
         <activity
             android:name=".GroundOverlayDemoActivity"
+            android:exported="true"
             android:label="@string/ground_overlay_demo_label" />
         <activity
             android:name=".IndoorDemoActivity"
+            android:exported="true"
             android:label="@string/indoor_demo_label" />
         <activity
             android:name=".LayersDemoActivity"
+            android:exported="true"
             android:label="@string/layers_demo_label" />
         <activity
             android:name=".LiteDemoActivity"
+            android:exported="true"
             android:label="@string/lite_demo_label" />
         <activity
             android:name=".LiteListDemoActivity"
+            android:exported="true"
             android:label="@string/lite_list_demo_label" />
         <activity
             android:name=".LocationSourceDemoActivity"
+            android:exported="true"
             android:label="@string/location_source_demo_label" />
         <activity
             android:name=".MapInPagerDemoActivity"
+            android:exported="true"
             android:label="@string/map_in_pager_demo_label" />
         <activity
             android:name=".MapColorSchemeActivity"
+            android:exported="true"
             android:label="@string/marker_demo_label" />
         <activity
             android:name=".MarkerDemoActivity"
+            android:exported="true"
             android:label="@string/marker_demo_label" />
         <activity
             android:name=".MarkerCloseInfoWindowOnRetapDemoActivity"
+            android:exported="true"
             android:label="@string/marker_close_info_window_on_retap_demo_label" />
         <activity
             android:name=".PolylineDemoActivity"
+            android:exported="true"
             android:label="@string/polyline_demo_label" />
         <activity
             android:name=".MultiMapDemoActivity"
+            android:exported="true"
             android:label="@string/multi_map_demo_label" />
         <activity
             android:name=".MyLocationDemoActivity"
+            android:exported="true"
             android:label="@string/my_location_demo_label" />
         <activity
             android:name=".OptionsDemoActivity"
+            android:exported="true"
             android:label="@string/options_demo_label" />
         <activity
             android:name=".PolygonDemoActivity"
+            android:exported="true"
             android:label="@string/polygon_demo_label" />
         <activity
             android:name=".ProgrammaticDemoActivity"
+            android:exported="true"
             android:label="@string/programmatic_demo_label" />
         <activity
             android:name=".RawMapViewDemoActivity"
+            android:exported="true"
             android:label="@string/raw_map_view_demo_label" />
         <activity
             android:name=".RetainMapDemoActivity"
+            android:exported="true"
             android:label="@string/retain_map_demo_label" />
         <activity
             android:name=".SaveStateDemoActivity"
+            android:exported="true"
             android:label="@string/save_state_demo_label" />
         <activity
             android:name=".SnapshotDemoActivity"
+            android:exported="true"
             android:label="@string/snapshot_demo_label" />
         <activity
             android:name=".SplitStreetViewPanoramaAndMapDemoActivity"
+            android:exported="true"
             android:label="@string/split_street_view_panorama_and_map_demo_label" />
         <activity
             android:name=".StreetViewPanoramaBasicDemoActivity"
+            android:exported="true"
             android:label="@string/street_view_panorama_basic_demo_label" />
         <activity
             android:name=".StreetViewPanoramaEventsDemoActivity"
+            android:exported="true"
             android:label="@string/street_view_panorama_events_demo_label" />
         <activity
             android:name=".StreetViewPanoramaNavigationDemoActivity"
+            android:exported="true"
             android:label="@string/street_view_panorama_navigation_demo_label" />
         <activity
             android:name=".StreetViewPanoramaOptionsDemoActivity"
+            android:exported="true"
             android:label="@string/street_view_panorama_options_demo_label" />
         <activity
             android:name=".StreetViewPanoramaViewDemoActivity"
+            android:exported="true"
             android:label="@string/street_view_panorama_view_demo_label" />
         <activity
             android:name=".StyledMapDemoActivity"
+            android:exported="true"
             android:label="@string/styled_map_demo_label" />
         <activity
             android:name=".TagsDemoActivity"
+            android:exported="true"
             android:label="@string/tags_demo_label" />
         <activity
             android:name=".TileCoordinateDemoActivity"
+            android:exported="true"
             android:label="@string/tile_coordinate_demo_label" />
         <activity
             android:name=".TileOverlayDemoActivity"
+            android:exported="true"
             android:label="@string/tile_overlay_demo_label" />
         <activity
             android:name=".UiSettingsDemoActivity"
+            android:exported="true"
             android:label="@string/ui_settings_demo_label" />
         <activity
             android:name=".VisibleRegionDemoActivity"
+            android:exported="true"
             android:label="@string/visible_region_demo_label" />
 
     </application>
diff --git a/ApiDemos/kotlin/app/src/main/AndroidManifest.xml b/ApiDemos/kotlin/app/src/main/AndroidManifest.xml
index 689bfdf6..a329111a 100644
--- a/ApiDemos/kotlin/app/src/main/AndroidManifest.xml
+++ b/ApiDemos/kotlin/app/src/main/AndroidManifest.xml
@@ -20,10 +20,10 @@
         The user's current location is displayed using the 'My Location' layer.
         Access to location is needed for the UI Settings Demo
     -->
-  <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-  <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
 
-  <application
+    <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -40,56 +40,138 @@
             android:name="com.google.android.geo.API_KEY"
             android:value="${MAPS_API_KEY}" />
 
-      <activity
-          android:name=".MainActivity"
-          android:exported="true">
-          <intent-filter>
-              <action android:name="android.intent.action.MAIN" />
-              <category android:name="android.intent.category.LAUNCHER" />
-          </intent-filter>
-      </activity>
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
 
-      <activity android:name=".AdvancedMarkersDemoActivity" />
-      <activity android:name=".BasicMapDemoActivity" />
-      <activity android:name=".BackgroundColorCustomizationDemoActivity" />
-      <activity android:name=".BackgroundColorCustomizationProgrammaticDemoActivity" />
-      <activity android:name=".CameraDemoActivity" />
-      <activity android:name=".CameraClampingDemoActivity" />
-      <activity android:name=".CloudBasedMapStylingDemoActivity" />
-      <activity android:name=".CircleDemoActivity" />
-      <activity android:name=".MarkerCloseInfoWindowOnRetapDemoActivity" />
-      <activity android:name=".EventsDemoActivity" />
-      <activity android:name=".GroundOverlayDemoActivity" />
-      <activity android:name=".IndoorDemoActivity" />
-      <activity android:name=".LayersDemoActivity" />
-      <activity android:name=".LiteDemoActivity" />
-      <activity android:name=".LiteListDemoActivity" />
-      <activity android:name=".LocationSourceDemoActivity" />
-      <activity android:name=".MapInPagerDemoActivity" />
-      <activity android:name=".MapColorSchemeActivity" />
-      <activity android:name=".MarkerDemoActivity" />
-      <activity android:name=".MultiMapDemoActivity" />
-      <activity android:name=".MyLocationDemoActivity" />
-      <activity android:name=".OptionsDemoActivity" />
-      <activity android:name=".PolygonDemoActivity" />
-      <activity android:name=".ProgrammaticDemoActivity" />
-      <activity android:name=".RawMapViewDemoActivity" />
-      <activity android:name=".RetainMapDemoActivity" />
-      <activity android:name=".SaveStateDemoActivity" />
-      <activity android:name=".SnapshotDemoActivity" />
-      <activity android:name=".SplitStreetViewPanoramaAndMapDemoActivity" />
-      <activity android:name=".StreetViewPanoramaBasicDemoActivity" />
-      <activity android:name=".StreetViewPanoramaEventsDemoActivity" />
-      <activity android:name=".StreetViewPanoramaNavigationDemoActivity" />
-      <activity android:name=".StreetViewPanoramaOptionsDemoActivity" />
-      <activity android:name=".StreetViewPanoramaViewDemoActivity" />
-      <activity android:name=".StyledMapDemoActivity" />
-      <activity android:name=".TagsDemoActivity" />
-      <activity android:name=".TileCoordinateDemoActivity" />
-      <activity android:name=".TileOverlayDemoActivity" />
-      <activity android:name=".UiSettingsDemoActivity" />
-      <activity android:name=".VisibleRegionDemoActivity" />
-      <activity android:name=".polyline.PolylineDemoActivity" />
+        <activity
+            android:name=".AdvancedMarkersDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".BasicMapDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".BackgroundColorCustomizationDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".BackgroundColorCustomizationProgrammaticDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".CameraDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".CameraClampingDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".CloudBasedMapStylingDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".CircleDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".MarkerCloseInfoWindowOnRetapDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".EventsDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".GroundOverlayDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".IndoorDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".LayersDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".LiteDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".LiteListDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".LocationSourceDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".MapInPagerDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".MapColorSchemeActivity"
+            android:exported="true" />
+        <activity
+            android:name=".MarkerDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".MultiMapDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".MyLocationDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".OptionsDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".PolygonDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".ProgrammaticDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".RawMapViewDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".RetainMapDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".SaveStateDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".SnapshotDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".SplitStreetViewPanoramaAndMapDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".StreetViewPanoramaBasicDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".StreetViewPanoramaEventsDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".StreetViewPanoramaNavigationDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".StreetViewPanoramaOptionsDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".StreetViewPanoramaViewDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".StyledMapDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".TagsDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".TileCoordinateDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".TileOverlayDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".UiSettingsDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".VisibleRegionDemoActivity"
+            android:exported="true" />
+        <activity
+            android:name=".polyline.PolylineDemoActivity"
+            android:exported="true" />
     </application>
 
 </manifest>
\ No newline at end of file