From a88ca8199837e32d9f9f998e16bcc203518f122d Mon Sep 17 00:00:00 2001
From: Chris Arriola <chrisarriola@google.com>
Date: Mon, 21 Mar 2022 15:57:06 -0700
Subject: [PATCH] chore: Add CloudBasedMapStylingDemoActivity to gms flavor.
 (#853)

* chore: Add CloudBasedMapStylingDemoActivity to gms flavor.

Change-Id: I95e1c76f04dfabed43cfea13a65c61e518acb279

* chore: Add CloudBasedMapStylingDemoActivity to gms demos kotlin.

Change-Id: I907741c12a4fba1ef10dcd0ec83fe2f10e8ee233

* Use gradle 7.2

Change-Id: I24ee0594db9f36f49f15d0c32a2c89f81ce6336f
---
 ApiDemos/java/app/src/gms/AndroidManifest.xml                  | 3 +++
 .../app/src/gms/java/com/example/mapdemo/DemoDetailsList.java  | 3 +++
 ApiDemos/kotlin/app/src/gms/AndroidManifest.xml                | 1 +
 .../src/gms/java/com/example/kotlindemos/DemoDetailsList.kt    | 2 ++
 .../MapWithMarker/gradle/wrapper/gradle-wrapper.properties     | 2 +-
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/ApiDemos/java/app/src/gms/AndroidManifest.xml b/ApiDemos/java/app/src/gms/AndroidManifest.xml
index 5c55e1ca..1e7b8274 100644
--- a/ApiDemos/java/app/src/gms/AndroidManifest.xml
+++ b/ApiDemos/java/app/src/gms/AndroidManifest.xml
@@ -46,6 +46,9 @@
         <activity
             android:name=".CameraClampingDemoActivity"
             android:label="@string/camera_clamping_demo_label" />
+        <activity
+            android:name=".CloudBasedMapStylingDemoActivity"
+            android:label="@string/cloud_styling_label" />
         <activity
             android:name=".CircleDemoActivity"
             android:label="@string/circle_demo_label" />
diff --git a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/DemoDetailsList.java b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/DemoDetailsList.java
index 76981edd..c31ddf07 100755
--- a/ApiDemos/java/app/src/gms/java/com/example/mapdemo/DemoDetailsList.java
+++ b/ApiDemos/java/app/src/gms/java/com/example/mapdemo/DemoDetailsList.java
@@ -46,6 +46,9 @@ public final class DemoDetailsList {
         new DemoDetails(R.string.camera_clamping_demo_label,
             R.string.camera_clamping_demo_description,
             CameraClampingDemoActivity.class),
+        new DemoDetails(R.string.cloud_styling_label,
+            R.string.cloud_styling_description,
+            CloudBasedMapStylingDemoActivity.class),
         new DemoDetails(R.string.circle_demo_label,
             R.string.circle_demo_description,
             CircleDemoActivity.class),
diff --git a/ApiDemos/kotlin/app/src/gms/AndroidManifest.xml b/ApiDemos/kotlin/app/src/gms/AndroidManifest.xml
index e17f07e8..f699f4fb 100644
--- a/ApiDemos/kotlin/app/src/gms/AndroidManifest.xml
+++ b/ApiDemos/kotlin/app/src/gms/AndroidManifest.xml
@@ -37,6 +37,7 @@
     <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" />
diff --git a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/DemoDetailsList.kt b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/DemoDetailsList.kt
index 6e603380..776f4599 100644
--- a/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/DemoDetailsList.kt
+++ b/ApiDemos/kotlin/app/src/gms/java/com/example/kotlindemos/DemoDetailsList.kt
@@ -41,6 +41,8 @@ class DemoDetailsList {
                   CameraClampingDemoActivity::class.java),
       DemoDetails(R.string.circle_demo_label, R.string.circle_demo_details,
                   CircleDemoActivity::class.java),
+      DemoDetails(R.string.cloud_styling_label, R.string.cloud_styling_description,
+                  CloudBasedMapStylingDemoActivity::class.java),
       DemoDetails(R.string.close_info_window_demo_label,
                   R.string.close_info_window_demo_details,
                   MarkerCloseInfoWindowOnRetapDemoActivity::class.java),
diff --git a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties
index 65565b56..ab66deab 100644
--- a/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties
+++ b/tutorials/java/MapWithMarker/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip