Skip to content

Commit 206cdcf

Browse files
dkhawkdkhawk
authored
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
1 parent 5ea1951 commit 206cdcf

File tree

2 files changed

+180
-56
lines changed

2 files changed

+180
-56
lines changed

‎ApiDemos/java/app/src/main/AndroidManifest.xml‎

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ distributed under the License is distributed on an "AS IS" BASIS,
1313
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1414
See the License for the specific language governing permissions and
1515
limitations under the License.
16-
-->
16+
-->
1717
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
1818

1919
<!--
@@ -49,7 +49,8 @@ limitations under the License.
4949
android:name="com.google.android.geo.API_KEY"
5050
android:value="${MAPS_API_KEY}" />
5151

52-
<activity android:name=".MainActivity"
52+
<activity
53+
android:name=".MainActivity"
5354
android:exported="true">
5455
<intent-filter>
5556
<action android:name="android.intent.action.MAIN" />
@@ -58,126 +59,167 @@ limitations under the License.
5859
</activity>
5960
<activity
6061
android:name=".AdvancedMarkersDemoActivity"
62+
android:exported="true"
6163
android:label="@string/advanced_markers_demo_label" />
6264
<activity
6365
android:name=".BasicMapDemoActivity"
66+
android:exported="true"
6467
android:label="@string/basic_map_demo_label" />
6568
<activity
6669
android:name=".BackgroundColorCustomizationDemoActivity"
67-
android:label="@string/background_color_customization_demo_label"/>
70+
android:exported="true"
71+
android:label="@string/background_color_customization_demo_label" />
6872
<activity
6973
android:name=".BackgroundColorCustomizationProgrammaticDemoActivity"
70-
android:label="@string/background_color_customization_programmatic_demo_label"/>
74+
android:exported="true"
75+
android:label="@string/background_color_customization_programmatic_demo_label" />
7176
<activity
7277
android:name=".CameraDemoActivity"
78+
android:exported="true"
7379
android:label="@string/camera_demo_label" />
7480
<activity
7581
android:name=".CameraClampingDemoActivity"
82+
android:exported="true"
7683
android:label="@string/camera_clamping_demo_label" />
7784
<activity
7885
android:name=".CloudBasedMapStylingDemoActivity"
86+
android:exported="true"
7987
android:label="@string/cloud_styling_label" />
8088
<activity
8189
android:name=".CircleDemoActivity"
90+
android:exported="true"
8291
android:label="@string/circle_demo_label" />
8392
<activity
8493
android:name=".EventsDemoActivity"
94+
android:exported="true"
8595
android:label="@string/events_demo_label" />
8696
<activity
8797
android:name=".GroundOverlayDemoActivity"
98+
android:exported="true"
8899
android:label="@string/ground_overlay_demo_label" />
89100
<activity
90101
android:name=".IndoorDemoActivity"
102+
android:exported="true"
91103
android:label="@string/indoor_demo_label" />
92104
<activity
93105
android:name=".LayersDemoActivity"
106+
android:exported="true"
94107
android:label="@string/layers_demo_label" />
95108
<activity
96109
android:name=".LiteDemoActivity"
110+
android:exported="true"
97111
android:label="@string/lite_demo_label" />
98112
<activity
99113
android:name=".LiteListDemoActivity"
114+
android:exported="true"
100115
android:label="@string/lite_list_demo_label" />
101116
<activity
102117
android:name=".LocationSourceDemoActivity"
118+
android:exported="true"
103119
android:label="@string/location_source_demo_label" />
104120
<activity
105121
android:name=".MapInPagerDemoActivity"
122+
android:exported="true"
106123
android:label="@string/map_in_pager_demo_label" />
107124
<activity
108125
android:name=".MapColorSchemeActivity"
126+
android:exported="true"
109127
android:label="@string/marker_demo_label" />
110128
<activity
111129
android:name=".MarkerDemoActivity"
130+
android:exported="true"
112131
android:label="@string/marker_demo_label" />
113132
<activity
114133
android:name=".MarkerCloseInfoWindowOnRetapDemoActivity"
134+
android:exported="true"
115135
android:label="@string/marker_close_info_window_on_retap_demo_label" />
116136
<activity
117137
android:name=".PolylineDemoActivity"
138+
android:exported="true"
118139
android:label="@string/polyline_demo_label" />
119140
<activity
120141
android:name=".MultiMapDemoActivity"
142+
android:exported="true"
121143
android:label="@string/multi_map_demo_label" />
122144
<activity
123145
android:name=".MyLocationDemoActivity"
146+
android:exported="true"
124147
android:label="@string/my_location_demo_label" />
125148
<activity
126149
android:name=".OptionsDemoActivity"
150+
android:exported="true"
127151
android:label="@string/options_demo_label" />
128152
<activity
129153
android:name=".PolygonDemoActivity"
154+
android:exported="true"
130155
android:label="@string/polygon_demo_label" />
131156
<activity
132157
android:name=".ProgrammaticDemoActivity"
158+
android:exported="true"
133159
android:label="@string/programmatic_demo_label" />
134160
<activity
135161
android:name=".RawMapViewDemoActivity"
162+
android:exported="true"
136163
android:label="@string/raw_map_view_demo_label" />
137164
<activity
138165
android:name=".RetainMapDemoActivity"
166+
android:exported="true"
139167
android:label="@string/retain_map_demo_label" />
140168
<activity
141169
android:name=".SaveStateDemoActivity"
170+
android:exported="true"
142171
android:label="@string/save_state_demo_label" />
143172
<activity
144173
android:name=".SnapshotDemoActivity"
174+
android:exported="true"
145175
android:label="@string/snapshot_demo_label" />
146176
<activity
147177
android:name=".SplitStreetViewPanoramaAndMapDemoActivity"
178+
android:exported="true"
148179
android:label="@string/split_street_view_panorama_and_map_demo_label" />
149180
<activity
150181
android:name=".StreetViewPanoramaBasicDemoActivity"
182+
android:exported="true"
151183
android:label="@string/street_view_panorama_basic_demo_label" />
152184
<activity
153185
android:name=".StreetViewPanoramaEventsDemoActivity"
186+
android:exported="true"
154187
android:label="@string/street_view_panorama_events_demo_label" />
155188
<activity
156189
android:name=".StreetViewPanoramaNavigationDemoActivity"
190+
android:exported="true"
157191
android:label="@string/street_view_panorama_navigation_demo_label" />
158192
<activity
159193
android:name=".StreetViewPanoramaOptionsDemoActivity"
194+
android:exported="true"
160195
android:label="@string/street_view_panorama_options_demo_label" />
161196
<activity
162197
android:name=".StreetViewPanoramaViewDemoActivity"
198+
android:exported="true"
163199
android:label="@string/street_view_panorama_view_demo_label" />
164200
<activity
165201
android:name=".StyledMapDemoActivity"
202+
android:exported="true"
166203
android:label="@string/styled_map_demo_label" />
167204
<activity
168205
android:name=".TagsDemoActivity"
206+
android:exported="true"
169207
android:label="@string/tags_demo_label" />
170208
<activity
171209
android:name=".TileCoordinateDemoActivity"
210+
android:exported="true"
172211
android:label="@string/tile_coordinate_demo_label" />
173212
<activity
174213
android:name=".TileOverlayDemoActivity"
214+
android:exported="true"
175215
android:label="@string/tile_overlay_demo_label" />
176216
<activity
177217
android:name=".UiSettingsDemoActivity"
218+
android:exported="true"
178219
android:label="@string/ui_settings_demo_label" />
179220
<activity
180221
android:name=".VisibleRegionDemoActivity"
222+
android:exported="true"
181223
android:label="@string/visible_region_demo_label" />
182224

183225
</application>

‎ApiDemos/kotlin/app/src/main/AndroidManifest.xml‎

Lines changed: 134 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
The user's current location is displayed using the 'My Location' layer.
2121
Access to location is needed for the UI Settings Demo
2222
-->
23-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
24-
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
23+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
24+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
2525

26-
<application
26+
<application
2727
android:allowBackup="true"
2828
android:icon="@mipmap/ic_launcher"
2929
android:label="@string/app_name"
@@ -40,56 +40,138 @@
4040
android:name="com.google.android.geo.API_KEY"
4141
android:value="${MAPS_API_KEY}" />
4242

43-
<activity
44-
android:name=".MainActivity"
45-
android:exported="true">
46-
<intent-filter>
47-
<action android:name="android.intent.action.MAIN" />
48-
<category android:name="android.intent.category.LAUNCHER" />
49-
</intent-filter>
50-
</activity>
43+
<activity
44+
android:name=".MainActivity"
45+
android:exported="true">
46+
<intent-filter>
47+
<action android:name="android.intent.action.MAIN" />
48+
<category android:name="android.intent.category.LAUNCHER" />
49+
</intent-filter>
50+
</activity>
5151

52-
<activity android:name=".AdvancedMarkersDemoActivity" />
53-
<activity android:name=".BasicMapDemoActivity" />
54-
<activity android:name=".BackgroundColorCustomizationDemoActivity" />
55-
<activity android:name=".BackgroundColorCustomizationProgrammaticDemoActivity" />
56-
<activity android:name=".CameraDemoActivity" />
57-
<activity android:name=".CameraClampingDemoActivity" />
58-
<activity android:name=".CloudBasedMapStylingDemoActivity" />
59-
<activity android:name=".CircleDemoActivity" />
60-
<activity android:name=".MarkerCloseInfoWindowOnRetapDemoActivity" />
61-
<activity android:name=".EventsDemoActivity" />
62-
<activity android:name=".GroundOverlayDemoActivity" />
63-
<activity android:name=".IndoorDemoActivity" />
64-
<activity android:name=".LayersDemoActivity" />
65-
<activity android:name=".LiteDemoActivity" />
66-
<activity android:name=".LiteListDemoActivity" />
67-
<activity android:name=".LocationSourceDemoActivity" />
68-
<activity android:name=".MapInPagerDemoActivity" />
69-
<activity android:name=".MapColorSchemeActivity" />
70-
<activity android:name=".MarkerDemoActivity" />
71-
<activity android:name=".MultiMapDemoActivity" />
72-
<activity android:name=".MyLocationDemoActivity" />
73-
<activity android:name=".OptionsDemoActivity" />
74-
<activity android:name=".PolygonDemoActivity" />
75-
<activity android:name=".ProgrammaticDemoActivity" />
76-
<activity android:name=".RawMapViewDemoActivity" />
77-
<activity android:name=".RetainMapDemoActivity" />
78-
<activity android:name=".SaveStateDemoActivity" />
79-
<activity android:name=".SnapshotDemoActivity" />
80-
<activity android:name=".SplitStreetViewPanoramaAndMapDemoActivity" />
81-
<activity android:name=".StreetViewPanoramaBasicDemoActivity" />
82-
<activity android:name=".StreetViewPanoramaEventsDemoActivity" />
83-
<activity android:name=".StreetViewPanoramaNavigationDemoActivity" />
84-
<activity android:name=".StreetViewPanoramaOptionsDemoActivity" />
85-
<activity android:name=".StreetViewPanoramaViewDemoActivity" />
86-
<activity android:name=".StyledMapDemoActivity" />
87-
<activity android:name=".TagsDemoActivity" />
88-
<activity android:name=".TileCoordinateDemoActivity" />
89-
<activity android:name=".TileOverlayDemoActivity" />
90-
<activity android:name=".UiSettingsDemoActivity" />
91-
<activity android:name=".VisibleRegionDemoActivity" />
92-
<activity android:name=".polyline.PolylineDemoActivity" />
52+
<activity
53+
android:name=".AdvancedMarkersDemoActivity"
54+
android:exported="true" />
55+
<activity
56+
android:name=".BasicMapDemoActivity"
57+
android:exported="true" />
58+
<activity
59+
android:name=".BackgroundColorCustomizationDemoActivity"
60+
android:exported="true" />
61+
<activity
62+
android:name=".BackgroundColorCustomizationProgrammaticDemoActivity"
63+
android:exported="true" />
64+
<activity
65+
android:name=".CameraDemoActivity"
66+
android:exported="true" />
67+
<activity
68+
android:name=".CameraClampingDemoActivity"
69+
android:exported="true" />
70+
<activity
71+
android:name=".CloudBasedMapStylingDemoActivity"
72+
android:exported="true" />
73+
<activity
74+
android:name=".CircleDemoActivity"
75+
android:exported="true" />
76+
<activity
77+
android:name=".MarkerCloseInfoWindowOnRetapDemoActivity"
78+
android:exported="true" />
79+
<activity
80+
android:name=".EventsDemoActivity"
81+
android:exported="true" />
82+
<activity
83+
android:name=".GroundOverlayDemoActivity"
84+
android:exported="true" />
85+
<activity
86+
android:name=".IndoorDemoActivity"
87+
android:exported="true" />
88+
<activity
89+
android:name=".LayersDemoActivity"
90+
android:exported="true" />
91+
<activity
92+
android:name=".LiteDemoActivity"
93+
android:exported="true" />
94+
<activity
95+
android:name=".LiteListDemoActivity"
96+
android:exported="true" />
97+
<activity
98+
android:name=".LocationSourceDemoActivity"
99+
android:exported="true" />
100+
<activity
101+
android:name=".MapInPagerDemoActivity"
102+
android:exported="true" />
103+
<activity
104+
android:name=".MapColorSchemeActivity"
105+
android:exported="true" />
106+
<activity
107+
android:name=".MarkerDemoActivity"
108+
android:exported="true" />
109+
<activity
110+
android:name=".MultiMapDemoActivity"
111+
android:exported="true" />
112+
<activity
113+
android:name=".MyLocationDemoActivity"
114+
android:exported="true" />
115+
<activity
116+
android:name=".OptionsDemoActivity"
117+
android:exported="true" />
118+
<activity
119+
android:name=".PolygonDemoActivity"
120+
android:exported="true" />
121+
<activity
122+
android:name=".ProgrammaticDemoActivity"
123+
android:exported="true" />
124+
<activity
125+
android:name=".RawMapViewDemoActivity"
126+
android:exported="true" />
127+
<activity
128+
android:name=".RetainMapDemoActivity"
129+
android:exported="true" />
130+
<activity
131+
android:name=".SaveStateDemoActivity"
132+
android:exported="true" />
133+
<activity
134+
android:name=".SnapshotDemoActivity"
135+
android:exported="true" />
136+
<activity
137+
android:name=".SplitStreetViewPanoramaAndMapDemoActivity"
138+
android:exported="true" />
139+
<activity
140+
android:name=".StreetViewPanoramaBasicDemoActivity"
141+
android:exported="true" />
142+
<activity
143+
android:name=".StreetViewPanoramaEventsDemoActivity"
144+
android:exported="true" />
145+
<activity
146+
android:name=".StreetViewPanoramaNavigationDemoActivity"
147+
android:exported="true" />
148+
<activity
149+
android:name=".StreetViewPanoramaOptionsDemoActivity"
150+
android:exported="true" />
151+
<activity
152+
android:name=".StreetViewPanoramaViewDemoActivity"
153+
android:exported="true" />
154+
<activity
155+
android:name=".StyledMapDemoActivity"
156+
android:exported="true" />
157+
<activity
158+
android:name=".TagsDemoActivity"
159+
android:exported="true" />
160+
<activity
161+
android:name=".TileCoordinateDemoActivity"
162+
android:exported="true" />
163+
<activity
164+
android:name=".TileOverlayDemoActivity"
165+
android:exported="true" />
166+
<activity
167+
android:name=".UiSettingsDemoActivity"
168+
android:exported="true" />
169+
<activity
170+
android:name=".VisibleRegionDemoActivity"
171+
android:exported="true" />
172+
<activity
173+
android:name=".polyline.PolylineDemoActivity"
174+
android:exported="true" />
93175
</application>
94176

95177
</manifest>

0 commit comments

Comments
 (0)