Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5 am: de992a99f8

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388

Change-Id: I5bb37aab6ba314bca3db22a574dbe38d671e4d3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

@@ -56,6 +56,7 @@ android_library {
         "androidx.cardview_cardview",
         "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
+        "androidx.window_window",
         "com.google.android.material_material",
         "setupcompat",
         "setupdesign",
@@ -75,7 +76,6 @@ android_library {
         "android.hardware.dumpstate-V1.1-java",
         "lottie",
         "WifiTrackerLib",
-        "windowExtLib",
         "SettingsLibActivityEmbedding",
     ],
 
@@ -105,10 +105,6 @@ android_app {
     ],
     static_libs: ["Settings-core"],
     uses_libs: ["org.apache.http.legacy"],
-    optional_uses_libs: [
-        "androidx.window.extensions",
-        "androidx.window.sidecar",
-    ],
     resource_dirs: [],
     optimize: {
         proguard_flags_files: ["proguard.flags"],
@@ -120,11 +116,6 @@ android_library_import {
     aars: ["libs/contextualcards.aar"],
 }
 
-android_library_import {
-    name: "windowExtLib",
-    aars: ["libs/window_ext_lib.aar"],
-}
-
 filegroup {
     name: "Settings_proguard_flags",
     srcs: ["proguard.flags"],

tests/robotests/Android.bp

@@ -34,6 +34,7 @@ android_app {
         "androidx.cardview_cardview",
         "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
+        "androidx.window_window",
         "com.google.android.material_material",
         "setupcompat",
         "setupdesign",
@@ -50,7 +51,6 @@ android_app {
         "contextualcards",
         "settings-logtags",
         "zxing-core-1.7",
-        "windowExtLib",
     ],
 
     aaptflags: ["--extra-packages com.android.settings"],