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

Commit 7195e05d authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 10 into master 

Bug: 139893257
Change-Id: Idcc078c0e541c04633db6d94c613ac4c861ba963
parents 1e53efc4 bd8030e8

.gitignore

0 → 100644
+2 −0
Original line number Diff line number Diff line 
.idea/

*.iml

Android.bp

+30 −13
Original line number Diff line number Diff line 
java_library {

    name: "settings-logtags",



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



}



// Build the Settings APK

android_app {

    name: "Settings",

    defaults: ["SettingsLibDefaults"],

android_library {

    name: "Settings-core",

    platform_apis: true,

    certificate: "platform",

    product_specific: true,

    privileged: true,

    required: ["privapp_whitelist_com.android.settings"],

    defaults: [

        "SettingsLibDefaults",

        "SettingsLib-search-defaults",

    ],



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



    static_libs: [

        "androidx-constraintlayout_constraintlayout",

        "androidx.slice_slice-builders",

        "androidx.slice_slice-core",

        "androidx.slice_slice-view",

        "androidx.core_core",

        "androidx.legacy_legacy-support-v4",

        "androidx.legacy_legacy-support-v13",

        "androidx.appcompat_appcompat",

        "androidx.cardview_cardview",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

        "androidx.legacy_legacy-preference-v14",

        "com.google.android.material_material",

        "setupcompat",

        "setupdesign",

        "androidx-constraintlayout_constraintlayout-solver",

        "androidx.lifecycle_lifecycle-runtime",

        "androidx.lifecycle_lifecycle-extensions",

        "guava",

        "jsr305",

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

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

        "contextualcards",

        "settings-logtags",

        "setup-wizard-lib-gingerbread-compat",

        "zxing-core-1.7",

    ],



    libs: [

        "telephony-common",

        "ims-common",

    ],

}



android_app {

    name: "Settings",

    platform_apis: true,

    certificate: "platform",

    product_specific: true,

    privileged: true,

    required: ["privapp_whitelist_com.android.settings"],

    static_libs: ["Settings-core"],

    resource_dirs: [],

    optimize: {

        proguard_flags_files: ["proguard.flags"],

    },

}



android_library_import {

    name: "contextualcards",

    aars: ["libs/contextualcards.aar"],

}

AndroidManifest.xml

+572 −650

File changed.

Preview size limit exceeded, changes collapsed.

OWNERS

+6 −2
Original line number Diff line number Diff line
@@ -6,9 +6,13 @@ asapperstein@google.com 
asargent@google.com

dehboxturtle@google.com

dhnishi@google.com

dling@google.com

edgarwang@google.com

emilychuang@google.com

jackqdyulei@google.com

lindatseng@google.com

mfritze@google.com

rafftsai@google.com

tmfang@google.com

zhfan@google.com



# Emergency approvers in case the above are not available

color-check-baseline.xml

+632 −572

File changed.

Preview size limit exceeded, changes collapsed.