From 8e00e4868b27210f2f1872c449c6d9fe2246d7b8 Mon Sep 17 00:00:00 2001
From: Diego Vela <diegovela@google.com>
Date: Thu, 7 Apr 2022 13:14:51 -0700
Subject: [PATCH] Use androidx.window prebuilt.

Use androidx.window prebuilt for consistency.

Bug: 223114509
Test: manual
Change-Id: If178cd0f9202ec2d9da2fc75f2edb12c47e61dac
---
 packages/SettingsLib/ActivityEmbedding/Android.bp         | 8 +++++++-
 .../SettingsLib/ActivityEmbedding/AndroidManifest.xml     | 5 +++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/SettingsLib/ActivityEmbedding/Android.bp b/packages/SettingsLib/ActivityEmbedding/Android.bp
index 2569198f96220..332bebffb6378 100644
--- a/packages/SettingsLib/ActivityEmbedding/Android.bp
+++ b/packages/SettingsLib/ActivityEmbedding/Android.bp
@@ -15,9 +15,15 @@ android_library {
     static_libs: [
         "androidx.annotation_annotation",
         "androidx.core_core",
-        "windowExtLib",
+        "androidx.window_window",
         "SettingsLibUtils",
     ],
     sdk_version: "system_current",
     min_sdk_version: "21",
+    // TODO(b/228508619) Remove the optional uses after fixing upstream
+    optional_uses_libs: [
+        "org.apache.http.legacy",
+        "androidx.window.extensions",
+        "androidx.window.sidecar",
+    ],
 }
diff --git a/packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml b/packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml
index 2e6c405f95293..5ce08b7747a47 100644
--- a/packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml
+++ b/packages/SettingsLib/ActivityEmbedding/AndroidManifest.xml
@@ -20,4 +20,9 @@
 
     <uses-sdk android:minSdkVersion="21" />
 
+    <application>
+        <uses-library android:name="androidx.window.extensions" android:required="false" />
+        <uses-library android:name="androidx.window.sidecar" android:required="false" />
+    </application>
+
 </manifest>