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

Commit 48b65ca5 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 13 

Bug: 242648940
Merged-In: Ie9ba3f7a9a4440c449cedbcfd03c0d383ce1bbe4
Change-Id: I7d823fd36c6d9395a86ec0757f55daf644193a01
parents dcd30811 d3a35891

Android.bp

+5 −12
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ android_library { 
        "SettingsLib-search-defaults",

    ],



    srcs: ["src/**/*.java"],

    srcs: ["src/**/*.java", "src/**/*.kt"],



    static_libs: [

        "androidx-constraintlayout_constraintlayout",
@@ -56,10 +56,10 @@ android_library { 
        "androidx.cardview_cardview",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.window_window",

        "com.google.android.material_material",

        "setupcompat",

        "setupdesign",

        "androidx-constraintlayout_constraintlayout-solver",

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.lifecycle_lifecycle-extensions",

        "guava",
@@ -67,6 +67,7 @@ android_library { 
        "net-utils-framework-common",

        "settings-contextual-card-protos-lite",

        "settings-log-bridge-protos-lite",

        "settings-telephony-protos-lite",

        "contextualcards",

        "settings-logtags",

        "statslog-settings",
@@ -74,7 +75,8 @@ android_library { 
        "android.hardware.dumpstate-V1.0-java",

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

        "lottie",

        "windowExtLib",

        "WifiTrackerLib",

        "SettingsLibActivityEmbedding",

    ],



    libs: [
@@ -103,10 +105,6 @@ 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"],
@@ -118,11 +116,6 @@ 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

+265 −50

File changed.

Preview size limit exceeded, changes collapsed.

color-check-baseline.xml

+339 −419

File changed.

Preview size limit exceeded, changes collapsed.

libs/window_ext_lib.aar

deleted100644 → 0
−143 KiB

File deleted.

View file

proguard.flags

+2 −1
Original line number Diff line number Diff line
@@ -68,5 +68,6 @@ 
}



# Keep WM Jetpack classes and callbacks

-keep class androidx.window.** { *; }

-keep class androidx.window.extensions.** { *; }

-dontwarn androidx.window.extensions.**

-keep class androidx.window.** { *; }