Merge "Import the window extension libary in the Settings app" into sc-v2-dev
diff --git a/Android.bp b/Android.bp
index bb9db22..dce25d7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -73,6 +73,7 @@
"android.hardware.dumpstate-V1.0-java",
"android.hardware.dumpstate-V1.1-java",
"lottie",
+ "windowExtLib",
],
libs: [
@@ -101,6 +102,10 @@
],
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"],
@@ -112,6 +117,11 @@
aars: ["libs/contextualcards.aar"],
}
+android_library_import {
+ name: "windowExtLib",
+ aars: ["libs/window_ext_lib.aar"],
+}
+
filegroup {
name: "Settings_proguard_flags",
srcs: ["proguard.flags"],
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4546a54..64bef73 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -120,7 +120,10 @@
android:directBootAware="true"
android:appComponentFactory="androidx.core.app.CoreComponentFactory">
- <uses-library android:name="org.apache.http.legacy" />
+ <uses-library android:name="org.apache.http.legacy"/>
+ <uses-library android:name="androidx.window.extensions" android:required="false"/>
+ <uses-library android:name="androidx.window.sidecar" android:required="false"/>
+
<!-- Settings -->
<activity android:name=".homepage.SettingsHomepageActivity"
diff --git a/libs/window_ext_lib.aar b/libs/window_ext_lib.aar
new file mode 100644
index 0000000..b1a9511
--- /dev/null
+++ b/libs/window_ext_lib.aar
Binary files differ
diff --git a/proguard.flags b/proguard.flags
index b66a786..3ed7136 100644
--- a/proguard.flags
+++ b/proguard.flags
@@ -66,3 +66,7 @@
-keepclasseswithmembers class * extends com.android.settings.slices.SliceBackgroundWorker {
public <init>(android.content.Context, android.net.Uri);
}
+
+# Keep WM Jetpack classes and callbacks
+-keep class androidx.window.** { *; }
+-dontwarn androidx.window.extensions.**