Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdbe97f9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Import the window extension libary in the Settings app" into sc-v2-dev am: a1b8347a 

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

Change-Id: I4064c73828fa62f5f895111a38ee143f6d9a27df
parents 5c8a325f a1b8347a

Android.bp

+10 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ android_library { 
        "android.hardware.dumpstate-V1.0-java",

        "android.hardware.dumpstate-V1.1-java",

        "lottie",

        "windowExtLib",

    ],



    libs: [
@@ -101,6 +102,10 @@ 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"],
@@ -112,6 +117,11 @@ 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"],

AndroidManifest.xml

+4 −1
Original line number Diff line number Diff line
@@ -121,6 +121,9 @@ 
            android:appComponentFactory="androidx.core.app.CoreComponentFactory">



        <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"

libs/window_ext_lib.aar

0 → 100644
+159 KiB

File added.

No diff preview for this file type.

View file

proguard.flags

+4 −0
Original line number Diff line number Diff line
@@ -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.**