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

Commit 69209263 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 24Q2 Release (ab/11526283) to aosp-main-future 

Bug: 337098550
Merged-In: I39640de1922b2439b8c4bb11cb6f70d5e0e7e218
Change-Id: I9fae8adc36970fdf9a2887fde6b03c04681b90ba
parents d6d829f9 60fa22da

Android.bp

+47 −54
Original line number Diff line number Diff line
@@ -19,22 +19,6 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



filegroup {

    name: "ThemePicker_srcs",

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],

}



filegroup {

    name: "ThemePicker_src_overrides",

    srcs: [

        "src_override/**/*.java",

        "src_override/**/*.kt",

    ],

}



// Production-only files that should be excluded in tests.

filegroup {

    name: "ThemePicker_src_prod",
@@ -42,46 +26,45 @@ filegroup { 
    srcs: ["src_override/com/android/customization/picker/CustomizationPickerApplication.java"],

}



filegroup {

    name: "ThemePicker_Manifest",

java_library {

    name: "ThemePickerOverridesLib",

    srcs: [

        "AndroidManifest.xml",

        "src_override/**/*.java",

        "src_override/**/*.kt",

    ],

    exclude_srcs: [":ThemePicker_src_prod"],

    libs: [

        "hilt_android",

        "ThemePickerLib",

    ],

}



genrule {

    name: "ThemePicker_res",

    tools: ["soong_zip"],

    srcs: [

        "res/**/*",

java_library {

    name: "ThemePickerApplicationLib",

    srcs: [":ThemePicker_src_prod"],

    libs: [

        "hilt_android",

        "ThemePickerLib",

        "ThemePickerOverridesLib",

    ],

    out: ["ThemePicker_res.zip"],

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

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

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

}



genrule {

    name: "ThemePicker_res_overrides",

    tools: ["soong_zip"],



filegroup {

    name: "ThemePicker_Manifest",

    srcs: [

        "res_override/**/*",

        "AndroidManifest.xml",

    ],

    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"

}



// Common defaults that doesn't have ThemePicker specifics.

java_defaults {

    name: "ThemePicker_common_defaults",

android_library {

    name: "ThemePickerLib",



    static_libs: [

        "guava",

        "monet",

        "renderscript_toolkit",

        "wallpaper-common-deps",

        "WallpaperPicker2Lib",

        "SettingsLibSettingsTheme",

        "SystemUI-statsd",

        "styleprotoslite",
@@ -93,21 +76,35 @@ java_defaults { 
        "hilt_android",

    ],



    jni_libs: [

        "librenderscript-toolkit",

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],



    srcs: [

        ":WallpaperPicker2_srcs",

        ":ThemePicker_srcs",

    resource_dirs: [

        "res",

        "res_override",

    ],



    manifest: "AndroidManifest-empty.xml",

}



java_defaults {

    name: "ThemePicker_defaults",

    static_libs: [

        "ThemePickerLib",

        "ThemePickerOverridesLib",

        "hilt_android",

    ],



    jni_libs: [

        "librenderscript-toolkit",

    ],



    required: ["android.software.theme_picker.xml"],



    use_embedded_native_libs: true,



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



    optimize: {

        enabled: false,

    },
@@ -118,12 +115,6 @@ java_defaults { 
    system_ext_specific: true,

}



java_defaults {

    name: "ThemePicker_defaults",

    defaults: ["ThemePicker_common_defaults"],

    srcs: [":ThemePicker_src_overrides"],

}



prebuilt_etc {

    name: "android.software.theme_picker.xml",

    system_ext_specific: true,
@@ -136,10 +127,12 @@ prebuilt_etc { 
//

android_app {

    name: "ThemePicker",

    package_name: "com.android.wallpaper",

    defaults: ["ThemePicker_defaults"],



    platform_apis: true,

    manifest: "AndroidManifest.xml",

    additional_manifests: [":WallpaperPicker2_Manifest"],

    overrides: ["WallpaperPicker", "WallpaperPicker2"],

    static_libs: ["ThemePickerApplicationLib"],

}

AndroidManifest-empty.xml

0 → 100644
+5 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

          xmlns:tools="http://schemas.android.com/tools"

          package="com.android.themepicker">

</manifest>

AndroidManifest.xml

+7 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!-- The package name here must match the Studio namespace given in

     WallpaperPickerGoogle gradle config for Studio builds to succeed.

     `package_name` in Android.bp overrides this with the actual package name.

 -->

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

          xmlns:tools="http://schemas.android.com/tools"

          package="com.android.wallpaper">

          package="com.google.android.apps.wallpaper">



    <uses-sdk android:targetSdkVersion="30" android:minSdkVersion="28"/>
@@ -15,6 +20,7 @@ 
    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>

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

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

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



    <queries>

        <package android:name="android"/>

android.software.theme_picker.xml

+1 −0
Original line number Diff line number Diff line
@@ -24,5 +24,6 @@ 
        <permission name="android.permission.SET_WALLPAPER"/>

        <permission name="android.permission.SET_WALLPAPER_COMPONENT"/>

        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>

        <permission name="android.permission.SET_WALLPAPER_DIM_AMOUNT"/>

    </privapp-permissions>

</permissions>

res/drawable/saturation_progress_drawable.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
            <shape>

                <size android:height="4dp" />

                <corners android:radius="2dp" />

                <solid android:color="@color/system_outline_variant" />

                <solid android:color="@color/system_outline" />

            </shape>

        </inset>

    </item>