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

Commit 301de5b4 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 13 QPR2 

Bug: 273316506
Merged-In: I1c7337beb907f1a1d3d527ee3e7c4633ee54e4f2
Change-Id: I19964c1a017471ec1cab0741e5aeb060b53a4278
parents 41d0c11d a8d5fd23

Android.bp

+38 −13
Original line number Diff line number Diff line
@@ -27,6 +27,14 @@ filegroup { 
    ],

}



filegroup {

    name: "ThemePicker_src_overrides",

    srcs: [

        "src_override/**/*.java",

        "src_override/**/*.kt",

    ],

}



filegroup {

    name: "ThemePicker_Manifest",

    srcs: [
@@ -46,11 +54,20 @@ genrule { 
        + "$(location soong_zip) -o $(out) -C $$RES_DIR -D $$RES_DIR"

}



//

// Build app code.

//

android_app {

    name: "ThemePicker",

genrule {

    name: "ThemePicker_res_overrides",

    tools: ["soong_zip"],

    srcs: [

        "res_override/**/*",

    ],

    out: ["ThemePicker_res_overrides.zip"],

    cmd: "INPUTS=($(in)) && "

        + "RES_DIR=$$(dirname $$(dirname $${INPUTS[0]})) && "

        + "$(location soong_zip) -o $(out) -C $$RES_DIR -D $$RES_DIR"

}



java_defaults {

    name: "ThemePicker_defaults",



    static_libs: [

        "guava",
@@ -60,6 +77,10 @@ android_app { 
        "SettingsLibSettingsTheme",

        "SystemUI-statsd",

        "styleprotoslite",

        "androidx.lifecycle_lifecycle-runtime-ktx",

        "androidx.lifecycle_lifecycle-viewmodel-ktx",

        "androidx.recyclerview_recyclerview",

        "SystemUICustomizationLib",

    ],



    jni_libs: [
@@ -69,17 +90,12 @@ android_app { 
    srcs: [

        ":WallpaperPicker2_srcs",

        ":ThemePicker_srcs",

        "src_override/**/*.java",

        "src_override/**/*.kt",

    ],



    resource_dirs: [

        "res_override",

        ":ThemePicker_src_overrides",

    ],



    use_embedded_native_libs: true,



    resource_zips: [":WallpaperPicker2_res", ":ThemePicker_res"],

    resource_zips: [":WallpaperPicker2_res", ":ThemePicker_res", ":ThemePicker_res_overrides"],



    optimize: {

        enabled: false,
@@ -89,6 +105,15 @@ android_app { 


    privileged: true,

    system_ext_specific: true,

}



//

// Build app code.

//

android_app {

    name: "ThemePicker",

    defaults: ["ThemePicker_defaults"],



    platform_apis: true,

    manifest: "AndroidManifest.xml",

    additional_manifests: [":WallpaperPicker2_Manifest"],

AndroidManifest.xml

+7 −1
Original line number Diff line number Diff line
@@ -8,8 +8,9 @@ 
    <uses-permission android:name="android.permission.CHANGE_OVERLAY_PACKAGES"/>

    <uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"/>

    <uses-permission android:name="android.permission.SET_WALLPAPER_COMPONENT" />



    <uses-permission android:name="android.permission.READ_DEVICE_CONFIG" />

    <uses-permission android:name="android.permission.MODIFY_DAY_NIGHT_MODE" />

    <uses-permission android:name="android.permission.CUSTOMIZE_SYSTEM_UI" />



    <queries>

        <!-- Specific intents Wallpaper picker query for -->
@@ -37,6 +38,11 @@ 
        <intent>

            <action android:name="com.android.launcher3.action.PARTNER_CUSTOMIZATION" />

        </intent>

        <!-- Intent filter used to query the launcher Activity for grid preview metadata -->

        <intent>

            <action android:name="android.intent.action.MAIN" />

            <category android:name="android.intent.category.HOME" />

        </intent>

    </queries>



    <application

TEST_MAPPING

0 → 100644
+12 −0
Original line number Diff line number Diff line 
{

  "presubmit": [

    {

      "name": "ThemePickerTests",

      "options": [

        {

          "exclude-annotation": "org.junit.Ignore"

        }

      ]

    }

  ]

}

ktfmt_includes.txt

+0 −4
Original line number Diff line number Diff line 
+src/

+src_override/

+tests/
 
-src/com/android/customization/model/color/ColorProvider.kt

-src/com/android/customization/model/color/ColorUtils.kt

-src/com/android/customization/module/SysUiStatsLogger.kt

-src/com/android/customization/picker/clock/ClockSectionView.kt

res/color-night/check_circle_grey_large_not_select_background_color.xml

+2 −3
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->

<selector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">

    <item android:color="?androidprv:attr/textColorSecondary" />

<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="@color/text_color_secondary" />

</selector>
 
 No newline at end of file