From fa63927d15330f9485c596f885c05495bc628c22 Mon Sep 17 00:00:00 2001 From: Angela Yu <5506675+wangela@users.noreply.github.com> Date: Thu, 25 Apr 2024 11:10:15 -0700 Subject: [PATCH] chore: add region tags to 6 samples (#1552) --- .../com/example/mapdemo/AdvancedMarkersDemoActivity.java | 2 ++ .../gms/java/com/example/mapdemo/EventsDemoActivity.java | 2 ++ .../gms/java/com/example/mapdemo/MarkerDemoActivity.java | 2 ++ .../java/com/example/mapdemo/MyLocationDemoActivity.java | 2 ++ .../java/com/example/mapdemo/PolygonDemoActivity.java | 9 +++++++-- .../mapdemo/{polyline => }/PolylineDemoActivity.java | 8 +++++++- .../example/kotlindemos/AdvancedMarkersDemoActivity.kt | 4 +++- .../java/com/example/kotlindemos/EventsDemoActivity.kt | 6 ++++-- .../java/com/example/kotlindemos/MarkerDemoActivity.kt | 2 ++ .../com/example/kotlindemos/MyLocationDemoActivity.kt | 4 +++- .../java/com/example/kotlindemos/PolygonDemoActivity.kt | 4 ++++ .../kotlindemos/{polyline => }/PolylineDemoActivity.kt | 4 ++++ 12 files changed, 42 insertions(+), 7 deletions(-) rename ApiDemos/java/app/src/gms/java/com/example/mapdemo/{polyline => }/PolylineDemoActivity.java (98%) rename ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/{polyline => }/PolylineDemoActivity.kt (98%) diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/AdvancedMarkersDemoActivity.java b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/AdvancedMarkersDemoActivity.java index 84d2e4ea..fdab9260 100644 --- a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/AdvancedMarkersDemoActivity.java +++ b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/AdvancedMarkersDemoActivity.java @@ -35,6 +35,7 @@ import com.google.android.gms.maps.model.PinConfig; * The following sample showcases how to create Advanced Markers, and use all their customization * possibilities. */ +// [START maps_android_sample_marker_advanced] public class AdvancedMarkersDemoActivity extends AppCompatActivity implements OnMapReadyCallback { private static final LatLng SINGAPORE = new LatLng(1.3521, 103.8198); @@ -135,3 +136,4 @@ public class AdvancedMarkersDemoActivity extends AppCompatActivity implements On Marker marker5 = map.addMarker(advancedMarkerOptions5); } } +// [END maps_android_sample_marker_advanced] diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/EventsDemoActivity.java b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/EventsDemoActivity.java index 78534c17..c484e34d 100644 --- a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/EventsDemoActivity.java +++ b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/EventsDemoActivity.java @@ -31,6 +31,7 @@ import androidx.appcompat.app.AppCompatActivity; /** * This shows how to listen to some {@link GoogleMap} events. */ +// [START maps_android_sample_events] public class EventsDemoActivity extends AppCompatActivity implements OnMapClickListener, OnMapLongClickListener, OnCameraIdleListener, OnMapReadyCallback { @@ -75,3 +76,4 @@ public class EventsDemoActivity extends AppCompatActivity cameraTextView.setText(map.getCameraPosition().toString()); } } +// [END maps_android_sample_events] \ No newline at end of file diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MarkerDemoActivity.java b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MarkerDemoActivity.java index 481e9113..2d0e5a55 100644 --- a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MarkerDemoActivity.java +++ b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MarkerDemoActivity.java @@ -64,6 +64,7 @@ import java.util.Random; /** * This shows how to place markers on a map. */ +// [START maps_android_sample_marker] public class MarkerDemoActivity extends AppCompatActivity implements OnMarkerClickListener, OnInfoWindowClickListener, @@ -505,3 +506,4 @@ public class MarkerDemoActivity extends AppCompatActivity implements } } +// [END maps_android_sample_marker] diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MyLocationDemoActivity.java b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MyLocationDemoActivity.java index 438cb48d..500c6b5f 100755 --- a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MyLocationDemoActivity.java +++ b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/MyLocationDemoActivity.java @@ -41,6 +41,7 @@ import android.widget.Toast; * android.Manifest.permission#ACCESS_COARSE_LOCATION} are requested at run time. If either * permission is not granted, the Activity is finished with an error message. */ +// [START maps_android_sample_my_location] public class MyLocationDemoActivity extends AppCompatActivity implements OnMyLocationButtonClickListener, @@ -158,3 +159,4 @@ public class MyLocationDemoActivity extends AppCompatActivity } } +// [END maps_android_sample_my_location] \ No newline at end of file diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/PolygonDemoActivity.java b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/PolygonDemoActivity.java index 791cecbd..4be71e21 100644 --- a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/PolygonDemoActivity.java +++ b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/PolygonDemoActivity.java @@ -47,6 +47,7 @@ import java.util.List; /** * This shows how to draw polygons on a map. */ +// [START maps_android_sample_polygons] public class PolygonDemoActivity extends AppCompatActivity implements OnSeekBarChangeListener, OnItemSelectedListener, OnMapReadyCallback { @@ -89,7 +90,6 @@ public class PolygonDemoActivity extends AppCompatActivity R.string.pattern_dotted, R.string.pattern_mixed, }; - @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -131,6 +131,7 @@ public class PolygonDemoActivity extends AppCompatActivity (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map); mapFragment.getMapAsync(this); } + // [START_EXCLUDE silent] private String[] getResourceStrings(int[] resourceIds) { String[] strings = new String[resourceIds.length]; @@ -139,6 +140,7 @@ public class PolygonDemoActivity extends AppCompatActivity } return strings; } + // [END_EXCLUDE] @Override public void onMapReady(GoogleMap map) { @@ -186,6 +188,7 @@ public class PolygonDemoActivity extends AppCompatActivity }); } + // [START_EXCLUDE silent] /** * Creates a List of LatLngs that form a rectangle with the given dimensions. */ @@ -286,4 +289,6 @@ public class PolygonDemoActivity extends AppCompatActivity mutablePolygon.setClickable(((CheckBox) view).isChecked()); } } -} \ No newline at end of file + // [END_EXCLUDE] +} +// [END maps_android_sample_polygons] \ No newline at end of file diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/polyline/PolylineDemoActivity.java b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/PolylineDemoActivity.java similarity index 98% rename from ApiDemos/java/app/src/gms/java/com/example/mapdemo/polyline/PolylineDemoActivity.java rename to ApiDemos/java/app/src/gms/java/com/example/mapdemo/PolylineDemoActivity.java index 3b515b0e..2aa5c1b4 100644 --- a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/polyline/PolylineDemoActivity.java +++ b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/PolylineDemoActivity.java @@ -54,6 +54,7 @@ import java.util.List; /** * This shows how to draw polylines on a map. */ +// [START maps_android_sample_polylines] public class PolylineDemoActivity extends AppCompatActivity implements OnSeekBarChangeListener, OnItemSelectedListener, OnMapReadyCallback { @@ -160,6 +161,7 @@ public class PolylineDemoActivity extends AppCompatActivity (SupportMapFragment) getSupportFragmentManager().findFragmentById(R.id.map); mapFragment.getMapAsync(this); } + // [START_EXCLUDE silent] private String[] getResourceStrings(int[] resourceIds) { String[] strings = new String[resourceIds.length]; @@ -168,6 +170,7 @@ public class PolylineDemoActivity extends AppCompatActivity } return strings; } + // [END_EXCLUDE] @Override public void onMapReady(GoogleMap map) { @@ -219,6 +222,7 @@ public class PolylineDemoActivity extends AppCompatActivity }); } + // [START_EXCLUDE silent] private Cap getSelectedCap(int pos) { int id = CAP_TYPE_NAME_RESOURCE_IDS[pos]; if (id == R.string.cap_butt) { @@ -319,4 +323,6 @@ public class PolylineDemoActivity extends AppCompatActivity mutablePolyline.setClickable(((CheckBox) view).isChecked()); } } -} \ No newline at end of file + // [END_EXCLUDE] +} +// [END maps_android_sample_polylines] \ No newline at end of file diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/AdvancedMarkersDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/AdvancedMarkersDemoActivity.kt index b7cb234b..2df551bf 100644 --- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/AdvancedMarkersDemoActivity.kt +++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/AdvancedMarkersDemoActivity.kt @@ -46,6 +46,7 @@ private val TAG = AdvancedMarkersDemoActivity::class.java.name * The following sample showcases how to create Advanced Markers, and use all their customization * possibilities. */ +// [START maps_android_sample_marker_advanced] class AdvancedMarkersDemoActivity : AppCompatActivity(), OnMapReadyCallback { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -136,4 +137,5 @@ class AdvancedMarkersDemoActivity : AppCompatActivity(), OnMapReadyCallback { val marker5: Marker? = map.addMarker(advancedMarkerOptions5) } -} \ No newline at end of file +} +// [END maps_android_sample_marker_advanced] \ No newline at end of file diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/EventsDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/EventsDemoActivity.kt index 55755e6b..5a4e923d 100644 --- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/EventsDemoActivity.kt +++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/EventsDemoActivity.kt @@ -25,6 +25,7 @@ import com.google.android.gms.maps.model.LatLng /** * This shows how to listen to some [GoogleMap] events. */ +// [START maps_android_sample_events] class EventsDemoActivity : AppCompatActivity(), OnMapClickListener, OnMapLongClickListener, OnCameraIdleListener, OnMapReadyCallback { @@ -58,7 +59,8 @@ class EventsDemoActivity : AppCompatActivity(), OnMapClickListener, } override fun onCameraIdle() { - if(!::map.isInitialized) return + if (!::map.isInitialized) return cameraTextView.text = map.cameraPosition.toString() } -} \ No newline at end of file +} +// [END maps_android_sample_events] \ No newline at end of file diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerDemoActivity.kt index fd6394e1..fe7db252 100644 --- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerDemoActivity.kt +++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MarkerDemoActivity.kt @@ -61,6 +61,7 @@ import java.util.Random /** * This shows how to place markers on a map. */ +// [START maps_android_sample_marker] class MarkerDemoActivity : AppCompatActivity(), OnMarkerClickListener, @@ -478,6 +479,7 @@ class MarkerDemoActivity : } } } +// [END maps_android_sample_marker] /** * This stores the details of a place that used to draw a marker diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MyLocationDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MyLocationDemoActivity.kt index 609eee75..60c2e91e 100644 --- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MyLocationDemoActivity.kt +++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/MyLocationDemoActivity.kt @@ -37,6 +37,7 @@ import com.google.android.gms.maps.SupportMapFragment * Permission for [Manifest.permission.ACCESS_FINE_LOCATION] and [Manifest.permission.ACCESS_COARSE_LOCATION] * are requested at run time. If either permission is not granted, the Activity is finished with an error message. */ +// [START maps_android_sample_my_location] class MyLocationDemoActivity : AppCompatActivity(), OnMyLocationButtonClickListener, OnMyLocationClickListener, OnMapReadyCallback, @@ -183,4 +184,5 @@ class MyLocationDemoActivity : AppCompatActivity(), */ private const val LOCATION_PERMISSION_REQUEST_CODE = 1 } -} \ No newline at end of file +} +// [END maps_android_sample_my_location] \ No newline at end of file diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolygonDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolygonDemoActivity.kt index 5d98e9fc..9b30dd7c 100644 --- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolygonDemoActivity.kt +++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolygonDemoActivity.kt @@ -82,6 +82,7 @@ class PolygonDemoActivity : private val patternTypeNameResourceIds = intArrayOf(R.string.pattern_solid, // Default R.string.pattern_dashed, R.string.pattern_dotted, R.string.pattern_mixed) + // [START maps_android_sample_polygons] override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.polygon_demo) @@ -128,10 +129,12 @@ class PolygonDemoActivity : val mapFragment = supportFragmentManager.findFragmentById(R.id.map) as SupportMapFragment mapFragment.getMapAsync(this) } + // [START_EXCLUDE silent] private fun getResourceStrings(resourceIds: IntArray): List { return resourceIds.map { getString(it) } } + // [END_EXCLUDE] override fun onMapReady(googleMap: GoogleMap) { @@ -184,6 +187,7 @@ class PolygonDemoActivity : } } + // [END maps_android_sample_polygons] /** * Creates a List of LatLngs that form a rectangle with the given dimensions. diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/polyline/PolylineDemoActivity.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolylineDemoActivity.kt similarity index 98% rename from ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/polyline/PolylineDemoActivity.kt rename to ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolylineDemoActivity.kt index d424b568..075c9480 100644 --- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/polyline/PolylineDemoActivity.kt +++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/PolylineDemoActivity.kt @@ -108,6 +108,7 @@ class PolylineDemoActivity : R.string.pattern_dotted, R.string.pattern_mixed) + // [START maps_android_sample_polylines] override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.polyline_demo) @@ -156,10 +157,12 @@ class PolylineDemoActivity : val mapFragment = supportFragmentManager.findFragmentById(R.id.map) as SupportMapFragment mapFragment.getMapAsync(this) } + // [START_EXCLUDE silent] private fun getResourceStrings(resourceIds: IntArray): List { return resourceIds.map { getString(it) } } + // [END_EXCLUDE] override fun onMapReady(googleMap: GoogleMap) { googleMap @@ -215,6 +218,7 @@ class PolylineDemoActivity : view -> mutablePolyline.isClickable = (view as CheckBox).isChecked } } + // [END maps_android_sample_polylines] private fun getSelectedCap(pos: Int): Cap? { return when (capTypeNameResourceIds[pos]) {