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

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

Merge 24Q3 to AOSP main 

Bug: 357762254
Merged-In: I4ac76e6ebd8fb178b12657bd2f505dc2b719e933
Change-Id: Icc79a2f085add198afa466748de0984ae694606e
parents 7f986dca 0e285d50

Android.bp

+9 −2
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ java_defaults { 
    name: "ThemePicker_defaults",

    static_libs: [

        "ThemePickerLib",

        "ThemePickerOverridesLib",

        "hilt_android",

    ],
@@ -115,6 +114,14 @@ java_defaults { 
    system_ext_specific: true,

}



java_defaults {

    name: "ThemePicker_defaults_with_overrides",

    defaults: ["ThemePicker_defaults"],

    static_libs: [

        "ThemePickerOverridesLib",

    ],

}



prebuilt_etc {

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

    system_ext_specific: true,
@@ -128,7 +135,7 @@ prebuilt_etc { 
android_app {

    name: "ThemePicker",

    package_name: "com.android.wallpaper",

    defaults: ["ThemePicker_defaults"],

    defaults: ["ThemePicker_defaults_with_overrides"],



    platform_apis: true,

    manifest: "AndroidManifest.xml",

PREUPLOAD.cfg

+9 −2
Original line number Diff line number Diff line 
[Builtin Hooks]

ktfmt = true



[Builtin Hooks Options]

ktfmt = --kotlinlang-style --include-dirs=src,src_override,tests



[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}



ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/packages/apps/ThemePicker/ktfmt_includes.txt ${PREUPLOAD_FILES}



flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PATH}



[Tool Paths]

ktfmt = ${REPO_ROOT}/external/ktfmt/ktfmt.sh

ktfmt_includes.txt

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

+src_override/

+tests/

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

res/drawable-night/ic_contrast_high.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

    android:width="48dp"

    android:height="48dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@android:color/system_accent1_200"

      android:pathData="M12,4C7,4 2.73,7.11 1,11.5C2.73,15.89 7,19 12,19s9.27,-3.11 11,-7.5C21.27,7.11 17,4 12,4zM12,16c-2.48,0 -4.5,-2.02 -4.5,-4.5S9.52,7 12,7s4.5,2.02 4.5,4.5S14.48,16 12,16z"/>

  <path

      android:fillColor="@android:color/system_accent1_50"

      android:pathData="M12,11.5m-2.7,0a2.7,2.7 0,1 1,5.4 0a2.7,2.7 0,1 1,-5.4 0"/>

</vector>

res/drawable-night/ic_contrast_medium.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2024 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

    android:width="48dp"

    android:height="48dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">

  <path

      android:fillColor="@android:color/system_accent1_400"

      android:pathData="M12,4C7,4 2.73,7.11 1,11.5C2.73,15.89 7,19 12,19s9.27,-3.11 11,-7.5C21.27,7.11 17,4 12,4zM12,16c-2.48,0 -4.5,-2.02 -4.5,-4.5S9.52,7 12,7s4.5,2.02 4.5,4.5S14.48,16 12,16z"/>

  <path

      android:fillColor="@android:color/system_accent1_100"

      android:pathData="M12,11.5m-2.7,0a2.7,2.7 0,1 1,5.4 0a2.7,2.7 0,1 1,-5.4 0"/>

</vector>