Import the window extension libary in the Settings app

Test: Rebuilt apk and run apk successfully.
Fix: 196939216
Change-Id: If9040ae9a1c72097e4964c8d40ea9785cf2f01dc
Merged-In: If9040ae9a1c72097e4964c8d40ea9785cf2f01dc
This commit is contained in:
Tsung-Mao Fang
2021-08-17 18:28:06 +08:00
parent c63c0d4370
commit c6e44c0e89
4 changed files with 18 additions and 1 deletions

View File

@@ -73,6 +73,7 @@ android_library {
"android.hardware.dumpstate-V1.0-java", "android.hardware.dumpstate-V1.0-java",
"android.hardware.dumpstate-V1.1-java", "android.hardware.dumpstate-V1.1-java",
"lottie", "lottie",
"windowExtLib",
], ],
libs: [ libs: [
@@ -101,6 +102,10 @@ android_app {
], ],
static_libs: ["Settings-core"], static_libs: ["Settings-core"],
uses_libs: ["org.apache.http.legacy"], uses_libs: ["org.apache.http.legacy"],
optional_uses_libs: [
"androidx.window.extensions",
"androidx.window.sidecar",
],
resource_dirs: [], resource_dirs: [],
optimize: { optimize: {
proguard_flags_files: ["proguard.flags"], proguard_flags_files: ["proguard.flags"],
@@ -112,6 +117,11 @@ android_library_import {
aars: ["libs/contextualcards.aar"], aars: ["libs/contextualcards.aar"],
} }
android_library_import {
name: "windowExtLib",
aars: ["libs/window_ext_lib.aar"],
}
filegroup { filegroup {
name: "Settings_proguard_flags", name: "Settings_proguard_flags",
srcs: ["proguard.flags"], srcs: ["proguard.flags"],

View File

@@ -120,7 +120,10 @@
android:directBootAware="true" android:directBootAware="true"
android:appComponentFactory="androidx.core.app.CoreComponentFactory"> 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 --> <!-- Settings -->
<activity android:name=".homepage.SettingsHomepageActivity" <activity android:name=".homepage.SettingsHomepageActivity"

BIN
libs/window_ext_lib.aar Normal file

Binary file not shown.

View File

@@ -66,3 +66,7 @@
-keepclasseswithmembers class * extends com.android.settings.slices.SliceBackgroundWorker { -keepclasseswithmembers class * extends com.android.settings.slices.SliceBackgroundWorker {
public <init>(android.content.Context, android.net.Uri); public <init>(android.content.Context, android.net.Uri);
} }
# Keep WM Jetpack classes and callbacks
-keep class androidx.window.** { *; }
-dontwarn androidx.window.extensions.**