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

Commit 41790c68 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 12L"

parents c73dfdb8 82155810

Android.bp

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

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

        "lottie",

        "windowExtLib",

    ],



    libs: [
@@ -102,6 +103,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"],
@@ -113,6 +118,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

+433 −35

File changed.

Preview size limit exceeded, changes collapsed.

color-check-baseline.xml

+937 −648

File changed.

Preview size limit exceeded, changes collapsed.

libs/window_ext_lib.aar

0 → 100644
+143 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.**