Bump to v6.2 and update to internal changes

map-sample/app/build.gradle

@@ -21,12 +21,12 @@ apply plugin: 'org.jetbrains.kotlin.android'
 ext {
     androidxLifecycleVersion = "2.6.2"
     glideVersion = "4.13.2"
-    navSdkVersion = "6.0.0"
+    navSdkVersion = "6.2.0"
 }
 
 android {
     namespace 'com.example.mapdemo'
-    compileSdkVersion 33
+    compileSdkVersion 34
 
     buildFeatures {
         buildConfig true
@@ -38,7 +38,7 @@ android {
         minSdkVersion 23
         // This example targets SDK 30 so that there's no need to explicitly include permissions
         // flows in the app.
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
         // Set this to the languages you actually use, otherwise you'll include resource strings
@@ -90,7 +90,7 @@ dependencies {
 
     // Add LeakCanary to debugImplementation because LeakCanary should only run
     // in debug builds.
-    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.12'
+    debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.14'
 
     // And dependencies.
     api "androidx.appcompat:appcompat:1.6.1"
@@ -103,7 +103,8 @@ dependencies {
     api "androidx.mediarouter:mediarouter:1.4.0"
     api "androidx.preference:preference:1.2.1"
     api "androidx.recyclerview:recyclerview:1.3.1"
-    api "androidx.transition:transition:1.4.1"
+    api "androidx.transition:transition:1.5.1"
+    api "androidx.viewpager2:viewpager2:1.0.0"
     api "androidx.window:window:1.1.0"
     api "com.github.bumptech.glide:glide:${glideVersion}"
     api "com.google.android.datatransport:transport-api:3.0.0"
@@ -112,8 +113,8 @@ dependencies {
     api 'com.google.errorprone:error_prone_annotations:2.11.0'
     api "joda-time:joda-time:2.10.14"
     api "com.google.android.material:material:1.5.0"
-    api 'org.jetbrains.kotlin:kotlin-reflect:2.0.0'
-    api 'org.jetbrains.kotlin:kotlin-stdlib:2.0.0'
+    api 'org.jetbrains.kotlin:kotlin-reflect:2.1.10'
+    api 'org.jetbrains.kotlin:kotlin-stdlib:2.1.10'
 
     annotationProcessor "androidx.annotation:annotation:1.7.0"
     annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}"

map-sample/app/src/main/java/com/example/mapdemo/BackgroundColorCustomizationDemoActivity.java

@@ -1,11 +1,11 @@
 /*
- * Copyright (C) 2012 The Android Open Source Project
+ * Copyright 2024 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,10 +17,10 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;

map-sample/app/src/main/java/com/example/mapdemo/CameraClampingDemoActivity.java

@@ -18,10 +18,10 @@
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.TextView;
 import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap.OnCameraMoveStartedListener;

map-sample/app/src/main/java/com/example/mapdemo/CameraDemoActivity.java

@@ -18,12 +18,12 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.CompoundButton;
 import android.widget.SeekBar;
 import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.CameraUpdate;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;

map-sample/app/src/main/java/com/example/mapdemo/CircleDemoActivity.java

@@ -20,12 +20,12 @@
 import android.graphics.Point;
 import android.location.Location;
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap.OnCircleClickListener;

map-sample/app/src/main/java/com/example/mapdemo/EventsDemoActivity.java

@@ -18,8 +18,8 @@
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap.OnCameraMoveStartedListener;
 import com.google.android.gms.maps.GoogleMap.OnMapClickListener;

map-sample/app/src/main/java/com/example/mapdemo/LayersDemoActivity.java

@@ -17,10 +17,10 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;

map-sample/app/src/main/java/com/example/mapdemo/MapInPagerDemoActivity.java

@@ -17,13 +17,13 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.viewpager.widget.ViewPager;
 import com.google.android.gms.maps.SupportMapFragment;
 import com.google.android.libraries.navigation.SupportNavigationFragment;

map-sample/app/src/main/java/com/example/mapdemo/MapStylingDemoActivity.java

@@ -18,9 +18,9 @@
 
 import android.content.res.Resources;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;

map-sample/app/src/main/java/com/example/mapdemo/MarkerAnchorsDemoActivity.java

@@ -17,10 +17,10 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap.OnMarkerClickListener;

map-sample/app/src/main/java/com/example/mapdemo/MarkerDemoActivity.java

@@ -21,7 +21,6 @@
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
-import androidx.appcompat.app.AppCompatActivity;
 import android.text.SpannableString;
 import android.text.style.ForegroundColorSpan;
 import android.util.Log;
@@ -37,6 +36,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap.InfoWindowAdapter;

map-sample/app/src/main/java/com/example/mapdemo/MultiMapWithNavDrawerDemoActivity.java

@@ -17,8 +17,8 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.MapView;
 import com.google.android.libraries.navigation.NavigationView;
 

map-sample/app/src/main/java/com/example/mapdemo/MyLocationDemoActivity.java

@@ -20,11 +20,11 @@
 import android.content.pm.PackageManager;
 import android.location.Location;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Toast;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import com.google.android.gms.maps.GoogleMap;

map-sample/app/src/main/java/com/example/mapdemo/PermissionUtils.java

@@ -22,10 +22,10 @@
 import android.content.DialogInterface;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
+import androidx.fragment.app.DialogFragment;
 
 /** Utility class for access to runtime permissions. */
 public abstract class PermissionUtils {

map-sample/app/src/main/java/com/example/mapdemo/PolygonControlFragmentPagerAdapter.java

@@ -16,10 +16,10 @@
 
 package com.example.mapdemo;
 
+import android.view.ViewGroup;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
-import android.view.ViewGroup;
 import java.util.HashMap;
 import java.util.Map;
 

map-sample/app/src/main/java/com/example/mapdemo/PolygonDemoActivity.java

@@ -18,8 +18,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.RadioGroup;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.viewpager.widget.ViewPager;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;

map-sample/app/src/main/java/com/example/mapdemo/PolylineControlFragmentPagerAdapter.java

@@ -16,10 +16,10 @@
 
 package com.example.mapdemo;
 
+import android.view.ViewGroup;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentPagerAdapter;
-import android.view.ViewGroup;
 import java.util.HashMap;
 import java.util.Map;
 

map-sample/app/src/main/java/com/example/mapdemo/PolylineDemoActivity.java

@@ -18,8 +18,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.RadioGroup;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.viewpager.widget.ViewPager;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;

map-sample/app/src/main/java/com/example/mapdemo/SaveStateDemoActivity.java

@@ -19,8 +19,8 @@
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
-import androidx.appcompat.app.AppCompatActivity;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap.OnMarkerClickListener;

map-sample/app/src/main/java/com/example/mapdemo/SnapshotDemoActivity.java

@@ -17,10 +17,10 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.fragment.app.FragmentActivity;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.ImageView;
+import androidx.fragment.app.FragmentActivity;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap.SnapshotReadyCallback;
 import com.google.android.gms.maps.OnMapReadyCallback;

map-sample/app/src/main/java/com/example/mapdemo/StreetViewLatLngAnywhereDemoActivity.java

@@ -17,7 +17,6 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.AdapterView;
@@ -31,6 +30,7 @@
 import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.StreetViewPanorama;
 import com.google.android.gms.maps.StreetViewPanorama.OnStreetViewPanoramaChangeListener;
 import com.google.android.gms.maps.SupportStreetViewPanoramaFragment;

map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaAnywhereDemoActivity.java

@@ -17,7 +17,6 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.util.Pair;
 import android.view.KeyEvent;
 import android.view.View;
@@ -30,6 +29,7 @@
 import android.widget.TextView.OnEditorActionListener;
 import android.widget.Toast;
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.StreetViewPanorama;
 import com.google.android.gms.maps.StreetViewPanorama.OnStreetViewPanoramaChangeListener;
 import com.google.android.gms.maps.SupportStreetViewPanoramaFragment;

map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaEventsDemoActivity.java

@@ -19,8 +19,8 @@
 import android.content.res.Resources;
 import android.graphics.Point;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.OnStreetViewPanoramaReadyCallback;
 import com.google.android.gms.maps.StreetViewPanorama;
 import com.google.android.gms.maps.StreetViewPanorama.OnStreetViewPanoramaCameraChangeListener;

map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaNavigationDemoActivity.java

@@ -17,10 +17,10 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.SeekBar;
 import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.StreetViewPanorama;
 import com.google.android.gms.maps.SupportStreetViewPanoramaFragment;
 import com.google.android.gms.maps.model.LatLng;

map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaOptionsDemoActivity.java

@@ -17,10 +17,10 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.View;
 import android.widget.CheckBox;
 import android.widget.Toast;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.StreetViewPanorama;
 import com.google.android.gms.maps.SupportStreetViewPanoramaFragment;
 import com.google.android.gms.maps.model.LatLng;

map-sample/app/src/main/java/com/example/mapdemo/StreetViewPanoramaViewDemoActivity.java

@@ -17,8 +17,8 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.view.ViewGroup.LayoutParams;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.StreetViewPanoramaOptions;
 import com.google.android.gms.maps.StreetViewPanoramaView;
 import com.google.android.gms.maps.model.LatLng;

map-sample/app/src/main/java/com/example/mapdemo/TagsDemoActivity.java

@@ -18,8 +18,8 @@
 
 import android.graphics.Color;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.TextView;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.GoogleMap.OnCircleClickListener;

map-sample/app/src/main/java/com/example/mapdemo/TileCoordinateDemoActivity.java

@@ -17,9 +17,9 @@
 package com.example.mapdemo;
 
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
 import android.widget.SeekBar;
 import android.widget.SeekBar.OnSeekBarChangeListener;
+import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;
 import com.google.android.gms.maps.SupportMapFragment;