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

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

Merge Android 13 QPR1 

Bug: 261731544
Merged-In: I25c4efdb73dc5eb88611efac669de13fa2be0c3d
Change-Id: Ia64e5c456168dd8d2fcb21b4e23f219f9c1a0b9c
parents 348b8b74 ffa6e8fa

Android.bp

+5 −17
Original line number Diff line number Diff line
@@ -24,22 +24,6 @@ filegroup { 
    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

        // Min requirement for CustomizationInjector and StatsLogUserEventLogger to build without Clock and Theme feature.

        "src/com/android/customization/model/clock/BaseClockManager.java",

        "src/com/android/customization/model/clock/Clockface.java",

        "src/com/android/customization/model/clock/ClockManager.java",

        "src/com/android/customization/model/clock/ClockProvider.java",

        "src/com/android/customization/model/theme/OverlayManagerCompat.java",

        "src/com/android/customization/model/theme/ThemeBundleProvider.java",

        "src/com/android/customization/model/theme/ThemeManager.java",

        "src/com/android/customization/model/theme/ThemeBundle.java",

        "src/com/android/customization/model/theme/custom/CustomTheme.java",

    ],

    exclude_srcs: [

        "src/com/android/customization/model/clock/**/*.java",

        "src/com/android/customization/model/theme/**/*.java",

        "src/com/android/customization/picker/clock/**/*.java",

        "src/com/android/customization/picker/theme/**/*.java",

    ],

}
@@ -54,7 +38,7 @@ genrule { 
    name: "ThemePicker_res",

    tools: ["soong_zip"],

    srcs: [

        "res/**/*"

        "res/**/*",

    ],

    out: ["ThemePicker_res.zip"],

    cmd: "INPUTS=($(in)) && "
@@ -89,6 +73,10 @@ android_app { 
        "src_override/**/*.kt",

    ],



    resource_dirs: [

        "res_override",

    ],



    use_embedded_native_libs: true,



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

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -13,6 +13,8 @@ 


    <queries>

        <!-- Specific intents Wallpaper picker query for -->

        <!-- Package for theme stub -->

        <package android:name="com.android.customization.themes" />

        <!-- Intent filter with action SET_WALLPAPER -->

        <intent>

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

PREUPLOAD.cfg

+2 −0
Original line number Diff line number Diff line 
[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}

ktfmt_includes.txt

0 → 100644
+7 −0
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/drawable/ic_clock_24px.xml

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

     Copyright (C) 2022 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="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?attr/colorControlNormal">

    <path

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

        android:pathData="M15.3,16.7 L16.7,15.3 13,11.6V7H11V12.4ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>

</vector>
 
 No newline at end of file