Skip to content

Commit 4014eaf

Browse files
arriolacarriolac
committed
Merge branch 'chris/v3-beta/3.1.0'
2 parents c26ca13 + 039244c commit 4014eaf

File tree

109 files changed

+4798
-1380
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+4798
-1380
lines changed

‎ApiDemos/java/app/build.gradle

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,13 @@ android {
5555
dependencies {
5656
implementation fileTree(dir: 'libs', include: ['*.jar'])
5757
implementation 'androidx.appcompat:appcompat:1.1.0'
58-
implementation 'com.google.android.gms:play-services-maps:17.0.0'
59-
// Needed for the LiteListDemo
6058
implementation "androidx.recyclerview:recyclerview:1.1.0"
6159

62-
v3Implementation name:'maps-sdk-3.0.0-beta', ext:'aar'
63-
v3Implementation 'com.google.android.gms:play-services-basement:17.3.0'
64-
v3Implementation 'com.google.android.gms:play-services-base:17.3.0'
65-
v3Implementation 'com.google.android.gms:play-services-gcm:17.0.0'
66-
v3Implementation 'com.google.android.gms:play-services-location:17.0.0'
60+
// GMS
61+
gmsImplementation 'com.google.android.gms:play-services-maps:17.0.0'
62+
63+
// V3
64+
v3Implementation 'com.google.android.libraries.maps:maps:3.1.0-beta'
6765

6866
// Tests
6967
testImplementation 'junit:junit:4.13'

‎ApiDemos/java/app/libs/maps-sdk-3.0.0-beta.aar

-9.23 MB
Binary file not shown.

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

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
package="com.example.mapdemo" >
18+
package="com.example.mapdemo">
1919

2020
<!--
2121
The ACCESS_COARSE/FINE_LOCATION permissions are not required to use
@@ -37,7 +37,7 @@
3737
android:icon="@mipmap/ic_launcher"
3838
android:label="@string/demo_title"
3939
android:supportsRtl="true"
40-
android:theme="@style/AppTheme" >
40+
android:theme="@style/AppTheme">
4141

4242
<!--
4343
To add your Maps API key to this project:
@@ -51,118 +51,124 @@
5151

5252
<activity android:name=".MainActivity">
5353
<intent-filter>
54-
<action android:name="android.intent.action.MAIN"/>
55-
<category android:name="android.intent.category.LAUNCHER"/>
54+
<action android:name="android.intent.action.MAIN" />
55+
<category android:name="android.intent.category.LAUNCHER" />
5656
</intent-filter>
5757
</activity>
5858
<activity
5959
android:name=".BasicMapDemoActivity"
60-
android:label="@string/basic_map_demo_label"/>
60+
android:label="@string/basic_map_demo_label" />
6161
<activity
6262
android:name=".CameraDemoActivity"
63-
android:label="@string/camera_demo_label"/>
63+
android:label="@string/camera_demo_label" />
6464
<activity
6565
android:name=".CameraClampingDemoActivity"
66-
android:label="@string/camera_clamping_demo_label"/>
66+
android:label="@string/camera_clamping_demo_label" />
6767
<activity
6868
android:name=".CircleDemoActivity"
69-
android:label="@string/circle_demo_label"/>
69+
android:label="@string/circle_demo_label" />
70+
<activity
71+
android:name=".CloudBasedMapStylingDemoActivity"
72+
android:label="@string/cloud_styling_label" />
7073
<activity
7174
android:name=".EventsDemoActivity"
72-
android:label="@string/events_demo_label"/>
75+
android:label="@string/events_demo_label" />
7376
<activity
7477
android:name=".GroundOverlayDemoActivity"
75-
android:label="@string/ground_overlay_demo_label"/>
78+
android:label="@string/ground_overlay_demo_label" />
7679
<activity
7780
android:name=".IndoorDemoActivity"
78-
android:label="@string/indoor_demo_label"/>
81+
android:label="@string/indoor_demo_label" />
7982
<activity
8083
android:name=".LayersDemoActivity"
81-
android:label="@string/layers_demo_label"/>
84+
android:label="@string/layers_demo_label" />
8285
<activity
8386
android:name=".LiteDemoActivity"
84-
android:label="@string/lite_demo_label"/>
87+
android:label="@string/lite_demo_label" />
8588
<activity
8689
android:name=".LiteListDemoActivity"
87-
android:label="@string/lite_list_demo_label"/>
90+
android:label="@string/lite_list_demo_label" />
8891
<activity
8992
android:name=".LocationSourceDemoActivity"
90-
android:label="@string/location_source_demo_label"/>
93+
android:label="@string/location_source_demo_label" />
9194
<activity
9295
android:name=".MapInPagerDemoActivity"
93-
android:label="@string/map_in_pager_demo_label"/>
96+
android:label="@string/map_in_pager_demo_label" />
9497
<activity
9598
android:name=".MarkerDemoActivity"
96-
android:label="@string/marker_demo_label"/>
99+
android:label="@string/marker_demo_label" />
97100
<activity
98101
android:name=".MarkerCloseInfoWindowOnRetapDemoActivity"
99-
android:label="@string/marker_close_info_window_on_retap_demo_label"/>
102+
android:label="@string/marker_close_info_window_on_retap_demo_label" />
103+
<activity
104+
android:name=".MarkerCollisionDemoActivity"
105+
android:label="@string/marker_collision_label" />
106+
<activity
107+
android:name=".polyline.PolylineDemoActivity"
108+
android:label="@string/polyline_demo_label" />
100109
<activity
101110
android:name=".MultiMapDemoActivity"
102-
android:label="@string/multi_map_demo_label"/>
111+
android:label="@string/multi_map_demo_label" />
103112
<activity
104113
android:name=".MyLocationDemoActivity"
105-
android:label="@string/my_location_demo_label"/>
114+
android:label="@string/my_location_demo_label" />
106115
<activity
107116
android:name=".OptionsDemoActivity"
108-
android:label="@string/options_demo_label"/>
117+
android:label="@string/options_demo_label" />
109118
<activity
110119
android:name=".PolygonDemoActivity"
111-
android:label="@string/polygon_demo_label"/>
112-
<activity
113-
android:name=".PolylineDemoActivity"
114-
android:label="@string/polyline_demo_label"/>
120+
android:label="@string/polygon_demo_label" />
115121
<activity
116122
android:name=".ProgrammaticDemoActivity"
117-
android:label="@string/programmatic_demo_label"/>
123+
android:label="@string/programmatic_demo_label" />
118124
<activity
119125
android:name=".RawMapViewDemoActivity"
120-
android:label="@string/raw_map_view_demo_label"/>
126+
android:label="@string/raw_map_view_demo_label" />
121127
<activity
122128
android:name=".RetainMapDemoActivity"
123-
android:label="@string/retain_map_demo_label"/>
129+
android:label="@string/retain_map_demo_label" />
124130
<activity
125131
android:name=".SaveStateDemoActivity"
126-
android:label="@string/save_state_demo_label"/>
132+
android:label="@string/save_state_demo_label" />
127133
<activity
128134
android:name=".SnapshotDemoActivity"
129-
android:label="@string/snapshot_demo_label"/>
135+
android:label="@string/snapshot_demo_label" />
130136
<activity
131137
android:name=".SplitStreetViewPanoramaAndMapDemoActivity"
132-
android:label="@string/split_street_view_panorama_and_map_demo_label"/>
138+
android:label="@string/split_street_view_panorama_and_map_demo_label" />
133139
<activity
134140
android:name=".StreetViewPanoramaBasicDemoActivity"
135-
android:label="@string/street_view_panorama_basic_demo_label"/>
141+
android:label="@string/street_view_panorama_basic_demo_label" />
136142
<activity
137143
android:name=".StreetViewPanoramaEventsDemoActivity"
138-
android:label="@string/street_view_panorama_events_demo_label"/>
144+
android:label="@string/street_view_panorama_events_demo_label" />
139145
<activity
140146
android:name=".StreetViewPanoramaNavigationDemoActivity"
141-
android:label="@string/street_view_panorama_navigation_demo_label"/>
147+
android:label="@string/street_view_panorama_navigation_demo_label" />
142148
<activity
143149
android:name=".StreetViewPanoramaOptionsDemoActivity"
144-
android:label="@string/street_view_panorama_options_demo_label"/>
150+
android:label="@string/street_view_panorama_options_demo_label" />
145151
<activity
146152
android:name=".StreetViewPanoramaViewDemoActivity"
147-
android:label="@string/street_view_panorama_view_demo_label"/>
153+
android:label="@string/street_view_panorama_view_demo_label" />
148154
<activity
149155
android:name=".StyledMapDemoActivity"
150-
android:label="@string/styled_map_demo_label"/>
156+
android:label="@string/styled_map_demo_label" />
151157
<activity
152158
android:name=".TagsDemoActivity"
153-
android:label="@string/tags_demo_label"/>
159+
android:label="@string/tags_demo_label" />
154160
<activity
155161
android:name=".TileCoordinateDemoActivity"
156-
android:label="@string/tile_coordinate_demo_label"/>
162+
android:label="@string/tile_coordinate_demo_label" />
157163
<activity
158164
android:name=".TileOverlayDemoActivity"
159-
android:label="@string/tile_overlay_demo_label"/>
165+
android:label="@string/tile_overlay_demo_label" />
160166
<activity
161167
android:name=".UiSettingsDemoActivity"
162-
android:label="@string/ui_settings_demo_label"/>
168+
android:label="@string/ui_settings_demo_label" />
163169
<activity
164170
android:name=".VisibleRegionDemoActivity"
165-
android:label="@string/visible_region_demo_label"/>
171+
android:label="@string/visible_region_demo_label" />
166172

167173
</application>
168174

‎ApiDemos/java/app/src/main/res/drawable-nodpi/chevron.png

456 Bytes
Loading

‎ApiDemos/java/app/src/main/res/drawable-nodpi/ook.png

9.36 KB
Loading

‎ApiDemos/java/app/src/main/res/values/strings.xml

Lines changed: 52 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,6 @@
9393
<string name="normal">Normal</string>
9494
<string name="options_demo_label">Options</string>
9595
<string name="options_demo_description">Demonstrates how to use Options to initialize a map.</string>
96-
<string name="polygon_demo_label">Polygons</string>
97-
<string name="polygon_demo_description">Demonstrates how to add Polygons to a map.</string>
98-
<string name="polyline_demo_label">Polylines</string>
99-
<string name="polyline_demo_description">Demonstrates how to add Polylines to a map.</string>
10096
<string name="programmatic_demo_label">Programmatically add map</string>
10197
<string name="programmatic_demo_description">Demonstrates how to add a MapFragment programmatically.</string>
10298
<string name="properties_circle">Properties for Circle(s)</string>
@@ -159,23 +155,6 @@
159155
<string name="zoom_in">+</string>
160156
<string name="zoom_out">-</string>
161157

162-
<!-- Polyline/polygon styling -->
163-
<string name="start_cap">Start cap</string>
164-
<string name="end_cap">End cap</string>
165-
<string name="joint_type">Joint Type</string>
166-
<string name="pattern">Pattern</string>
167-
<string name="cap_butt">Butt</string>
168-
<string name="cap_square">Square</string>
169-
<string name="cap_round">Round</string>
170-
<string name="cap_image">Image</string>
171-
<string name="joint_type_default">Default</string>
172-
<string name="joint_type_bevel">Bevel</string>
173-
<string name="joint_type_round">Round</string>
174-
<string name="pattern_solid">Solid</string>
175-
<string name="pattern_dotted">Dotted</string>
176-
<string name="pattern_dashed">Dashed</string>
177-
<string name="pattern_mixed">Mixed</string>
178-
179158
<!-- Lite Mode -->
180159
<string name="grid">Grid</string>
181160
<string name="lite_demo_label">Lite Mode</string>
@@ -239,4 +218,56 @@
239218
<string name="location_permission_denied">This sample requires location permission to enable the \'my location\' layer. Please try again and grant access to use the location.\nIf the permission has been permanently denied, it can be enabled from the System Settings &gt; Apps &gt; \'Google Maps API Demos\'.</string>
240219
<string name="permission_required_toast">Location permission is required for this demo.</string>
241220

221+
<!-- Cloud Styling -->
222+
<string name="cloud_styling_basic_map_id">26a66b031807a453</string>
223+
<string name="lite_styling_normal_mode">Normal</string>
224+
<string name="lite_styling_satellite_mode">Satellite</string>
225+
<string name="lite_styling_hybrid_mode">Hybrid</string>
226+
<string name="lite_styling_terrain_mode">Terrain</string>
227+
<string name="cloud_styling_label">Cloud Styling</string>
228+
<string name="cloud_styling_description">Demonstrates how to use a simple map using Cloud Styling.</string>
229+
230+
<!-- Polyline/polygon styling -->
231+
<string name="polygon_demo_label">Polygons</string>
232+
<string name="polygon_demo_description">Demonstrates how to add Polygons to a map.</string>
233+
<string name="start_cap">Start cap</string>
234+
<string name="end_cap">End cap</string>
235+
<string name="joint_type">Joint Type</string>
236+
<string name="pattern">Pattern</string>
237+
<string name="cap_butt">Butt</string>
238+
<string name="cap_square">Square</string>
239+
<string name="cap_round">Round</string>
240+
<string name="cap_image">Image</string>
241+
<string name="joint_type_default">Default</string>
242+
<string name="joint_type_bevel">Bevel</string>
243+
<string name="joint_type_round">Round</string>
244+
<string name="pattern_solid">Solid</string>
245+
<string name="pattern_dotted">Dotted</string>
246+
<string name="pattern_dashed">Dashed</string>
247+
<string name="pattern_mixed">Mixed</string>
248+
<string name="polyline_demo_label">Polylines</string>
249+
<string name="polyline_demo_description">Demonstrates how to add and configure Polylines to a map.</string>
250+
<string name="polyline_selection">Select polyline</string>
251+
<string name="polyline_sydney">Sydney</string>
252+
<string name="polyline_melbourne">Melbourne</string>
253+
<string name="polyline_australia">Australia</string>
254+
<string name="polyline_world">World</string>
255+
<string name="argb">ARGB</string>
256+
<string name="cap_custom_chevron">Chevron</string>
257+
<string name="cap_custom_ook">Ook</string>
258+
<string name="joint_default">Default</string>
259+
<string name="joint_bevel">Bevel</string>
260+
<string name="joint_round">Round</string>
261+
<string name="solid" desc="Label of a toggle button indicating that the selected polyline should have solid color.">Solid color</string>
262+
<string name="gradient" desc="Label of a toggle button indicating that the selected polyline should have a color gradient.">Gradient color</string>
263+
<string name="textured" desc="Label of a checkbox indicating whether or not the selected polyline has texture.">Textured</string>
264+
<string name="point_sprite" desc="Label of a checkbox indicating whether or not the point sprite rendering technique is applied on textured polyline.">Point sprite</string>
265+
<string name="default_style" desc="Label of a radio group indicating whether or not default style is applied.">Default</string>
266+
<string name="geodesic">Geodesic</string>
267+
<string name="visible">Visible</string>
268+
269+
<!-- Marker Collision -->
270+
<string name="marker_collision_label">Marker Collision</string>
271+
<string name="marker_collision_description">Demonstrates different supported marker collision behaviors.</string>
272+
242273
</resources>

‎ApiDemos/java/app/src/v3/java/com/example/mapdemo/BasicMapDemoActivity.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
/**
2-
* DO NOT EDIT THIS FILE.
3-
*
4-
* This source code was autogenerated from source code within the `app/src/gms` directory
5-
* and is not intended for modifications. If any edits should be made, please do so in the
6-
* corresponding file under the `app/src/gms` directory.
7-
*/
81
// Copyright 2020 Google LLC
92
//
103
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,7 +21,6 @@
2821
import com.google.android.libraries.maps.model.MarkerOptions;
2922

3023
import android.os.Bundle;
31-
3224
import androidx.appcompat.app.AppCompatActivity;
3325

3426
/**

‎ApiDemos/java/app/src/v3/java/com/example/mapdemo/CameraClampingDemoActivity.java

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
/**
2-
* DO NOT EDIT THIS FILE.
3-
*
4-
* This source code was autogenerated from source code within the `app/src/gms` directory
5-
* and is not intended for modifications. If any edits should be made, please do so in the
6-
* corresponding file under the `app/src/gms` directory.
7-
*/
81
// Copyright 2020 Google LLC
92
//
103
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +12,6 @@
1912
// See the License for the specific language governing permissions and
2013
// limitations under the License.
2114

22-
2315
package com.example.mapdemo;
2416

2517
import com.google.android.libraries.maps.CameraUpdateFactory;
@@ -32,12 +24,11 @@
3224
import com.google.android.libraries.maps.model.LatLngBounds;
3325

3426
import android.os.Bundle;
27+
import androidx.appcompat.app.AppCompatActivity;
3528
import android.view.View;
3629
import android.widget.TextView;
3730
import android.widget.Toast;
3831

39-
import androidx.appcompat.app.AppCompatActivity;
40-
4132
/**
4233
* This shows how to constrain the camera to specific boundaries and zoom levels.
4334
*/

‎ApiDemos/java/app/src/v3/java/com/example/mapdemo/CameraDemoActivity.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
/**
2-
* DO NOT EDIT THIS FILE.
3-
*
4-
* This source code was autogenerated from source code within the `app/src/gms` directory
5-
* and is not intended for modifications. If any edits should be made, please do so in the
6-
* corresponding file under the `app/src/gms` directory.
7-
*/
81
// Copyright 2020 Google LLC
92
//
103
// Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +12,6 @@
1912
// See the License for the specific language governing permissions and
2013
// limitations under the License.
2114

22-
2315
package com.example.mapdemo;
2416

2517
import android.graphics.Color;

‎ApiDemos/java/app/src/v3/java/com/example/mapdemo/CircleDemoActivity.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
/**
2-
* DO NOT EDIT THIS FILE.
3-
*
4-
* This source code was autogenerated from source code within the `app/src/gms` directory
5-
* and is not intended for modifications. If any edits should be made, please do so in the
6-
* corresponding file under the `app/src/gms` directory.
7-
*/
81
// Copyright 2020 Google LLC
92
//
103
// Licensed under the Apache License, Version 2.0 (the "License");

0 commit comments

Comments
 (0)