Glimpse: Sync dependencies to 16 QPR2

Note: Importing Material lib, since AOSP one is older

Change-Id: Id9351d4489de42fe9c6511d93a11d44e11572a34

Author: SebaUbuntu

app/Android.bp

@@ -47,6 +47,7 @@ android_app {
         "androidx.core_core-ktx",
         "androidx.exifinterface_exifinterface",
         "androidx.fragment_fragment-ktx",
+        "androidx.graphics_graphics-shapes",
         "androidx.lifecycle_lifecycle-runtime",
         "androidx.lifecycle_lifecycle-runtime-ktx",
         "androidx.lifecycle_lifecycle-service",
@@ -58,10 +59,11 @@ android_app {
         "Glimpse_androidx.media3_media3-exoplayer-rtsp",
         "Glimpse_androidx.media3_media3-exoplayer-smoothstreaming",
         "Glimpse_androidx.media3_media3-ui",
-        "Glimpse_androidx.navigation_navigation-common-android",
-        "Glimpse_androidx.navigation_navigation-fragment-ktx",
-        "Glimpse_androidx.navigation_navigation-runtime-android",
-        "Glimpse_androidx.navigation_navigation-ui-ktx",
+        "androidx.navigation_navigation-common",
+        "androidx.navigation_navigation-fragment-ktx",
+        "androidx.navigation_navigation-runtime",
+        "androidx.navigation_navigation-ui-ktx",
+        "androidx.navigationevent_navigationevent",
         "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
         "androidx.recyclerview_recyclerview-selection",
@@ -70,7 +72,7 @@ android_app {
         "Glimpse_com.adobe.xmp_xmpcore",
         "Glimpse_com.github.bumptech.glide_glide",
         "Glimpse_com.github.bumptech.glide_okhttp3-integration",
-        "com.google.android.material_material",
+        "Glimpse_com.google.android.material_material",
         "Glimpse_com.squareup.okhttp3_okhttp",
         "Glimpse_io.github.panpf.zoomimage_zoomimage-core-android",
         "Glimpse_io.github.panpf.zoomimage_zoomimage-view-glide",

app/build.gradle.kts

@@ -87,13 +87,12 @@ generateBp {
     availableInAOSP = { module ->
         when {
             module.group.startsWith("androidx") -> {
-                // We provide our own androidx.media3 and androidx.navigation
-                !module.group.startsWith("androidx.media3") &&
-                        !module.group.startsWith("androidx.navigation")
+                // We provide our own androidx.media3
+                !module.group.startsWith("androidx.media3")
             }
 
             module.group.startsWith("org.jetbrains") -> true
-            module.group == "com.google.android.material" -> true
+            module.group == "com.google.errorprone" -> true
             module.group == "com.google.guava" -> true
             else -> false
         }

app/libs/Android.bp

@@ -219,158 +219,6 @@ android_library_import {
     ],
 }
 
-java_library_static {
-    name: "Glimpse_androidx.navigation_navigation-common",
-    sdk_version: "36",
-    min_sdk_version: "30",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [
-        "Glimpse_androidx.navigation_navigation-common-android",
-    ],
-}
-
-android_library_import {
-    name: "Glimpse_androidx.navigation_navigation-common-android",
-    aars: ["androidx/navigation/navigation-common-android/2.9.5/navigation-common-release.aar"],
-    sdk_version: "36",
-    min_sdk_version: "30",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [
-        "androidx.annotation_annotation",
-        "androidx.collection_collection",
-        "androidx.core_core-ktx",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.lifecycle_lifecycle-runtime",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "androidx.lifecycle_lifecycle-viewmodel-savedstate",
-        "androidx.profileinstaller_profileinstaller",
-        "androidx.savedstate_savedstate",
-        "kotlin-stdlib",
-        "kotlinx_serialization_core",
-    ],
-}
-
-android_library_import {
-    name: "Glimpse_androidx.navigation_navigation-fragment",
-    aars: ["androidx/navigation/navigation-fragment/2.9.5/navigation-fragment-2.9.5.aar"],
-    sdk_version: "36",
-    min_sdk_version: "30",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [
-        "androidx.activity_activity",
-        "androidx.core_core-ktx",
-        "androidx.fragment_fragment-ktx",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.lifecycle_lifecycle-livedata-core",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "Glimpse_androidx.navigation_navigation-common",
-        "Glimpse_androidx.navigation_navigation-runtime",
-        "androidx.savedstate_savedstate",
-        "androidx.slidingpanelayout_slidingpanelayout",
-        "kotlin-stdlib",
-        "kotlinx-coroutines-core",
-        "kotlinx_serialization_core",
-    ],
-}
-
-android_library_import {
-    name: "Glimpse_androidx.navigation_navigation-fragment-ktx",
-    aars: ["androidx/navigation/navigation-fragment-ktx/2.9.5/navigation-fragment-ktx-2.9.5.aar"],
-    sdk_version: "36",
-    min_sdk_version: "30",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [
-        "Glimpse_androidx.navigation_navigation-fragment",
-    ],
-}
-
-java_library_static {
-    name: "Glimpse_androidx.navigation_navigation-runtime",
-    sdk_version: "36",
-    min_sdk_version: "30",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [
-        "Glimpse_androidx.navigation_navigation-runtime-android",
-    ],
-}
-
-android_library_import {
-    name: "Glimpse_androidx.navigation_navigation-runtime-android",
-    aars: ["androidx/navigation/navigation-runtime-android/2.9.5/navigation-runtime-release.aar"],
-    sdk_version: "36",
-    min_sdk_version: "30",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [
-        "androidx.activity_activity-ktx",
-        "androidx.annotation_annotation-experimental",
-        "androidx.collection_collection",
-        "androidx.core_core-ktx",
-        "androidx.lifecycle_lifecycle-common",
-        "androidx.lifecycle_lifecycle-runtime",
-        "androidx.lifecycle_lifecycle-runtime-ktx",
-        "androidx.lifecycle_lifecycle-viewmodel",
-        "androidx.lifecycle_lifecycle-viewmodel-ktx",
-        "Glimpse_androidx.navigation_navigation-common",
-        "kotlin-stdlib",
-        "kotlinx-coroutines-core",
-        "kotlinx_serialization_core",
-    ],
-}
-
-android_library_import {
-    name: "Glimpse_androidx.navigation_navigation-ui",
-    aars: ["androidx/navigation/navigation-ui/2.9.5/navigation-ui-2.9.5.aar"],
-    sdk_version: "36",
-    min_sdk_version: "30",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [
-        "androidx.appcompat_appcompat",
-        "androidx.coordinatorlayout_coordinatorlayout",
-        "androidx.core_core-ktx",
-        "androidx.customview_customview",
-        "androidx.drawerlayout_drawerlayout",
-        "Glimpse_androidx.navigation_navigation-common",
-        "Glimpse_androidx.navigation_navigation-runtime",
-        "androidx.transition_transition",
-        "com.google.android.material_material",
-    ],
-}
-
-android_library_import {
-    name: "Glimpse_androidx.navigation_navigation-ui-ktx",
-    aars: ["androidx/navigation/navigation-ui-ktx/2.9.5/navigation-ui-ktx-2.9.5.aar"],
-    sdk_version: "36",
-    min_sdk_version: "30",
-    apex_available: [
-        "//apex_available:platform",
-        "//apex_available:anyapex",
-    ],
-    static_libs: [
-        "Glimpse_androidx.navigation_navigation-ui",
-    ],
-}
-
 java_import {
     name: "Glimpse_com.adobe.xmp_xmpcore",
     jars: ["com/adobe/xmp/xmpcore/6.1.11/xmpcore-6.1.11.jar"],
@@ -460,6 +308,39 @@ android_library_import {
     ],
 }
 
+android_library_import {
+    name: "Glimpse_com.google.android.material_material",
+    aars: ["com/google/android/material/material/1.14.0-alpha10/material-1.14.0-alpha10.aar"],
+    sdk_version: "36",
+    min_sdk_version: "30",
+    apex_available: [
+        "//apex_available:platform",
+        "//apex_available:anyapex",
+    ],
+    static_libs: [
+        "androidx.activity_activity",
+        "androidx.annotation_annotation",
+        "androidx.annotation_annotation-experimental",
+        "androidx.appcompat_appcompat",
+        "androidx.cardview_cardview",
+        "androidx-constraintlayout_constraintlayout",
+        "androidx.coordinatorlayout_coordinatorlayout",
+        "androidx.core_core",
+        "androidx.customview_customview",
+        "androidx.drawerlayout_drawerlayout",
+        "androidx.dynamicanimation_dynamicanimation",
+        "androidx.fragment_fragment",
+        "androidx.graphics_graphics-shapes",
+        "androidx.lifecycle_lifecycle-runtime",
+        "androidx.recyclerview_recyclerview",
+        "androidx.resourceinspection_resourceinspection-annotation",
+        "androidx.transition_transition",
+        "androidx.vectordrawable_vectordrawable",
+        "androidx.viewpager2_viewpager2",
+        "error_prone_annotations",
+    ],
+}
+
 java_import {
     name: "Glimpse_com.squareup.okhttp3_okhttp",
     jars: ["com/squareup/okhttp3/okhttp/4.12.0/okhttp-4.12.0.jar"],