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

Commit 294b4e85 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge Android 13 

Bug: 242648940
Merged-In: Ia1d57375170cd8b0c33f3685b2dc3ef0c52ab117
Change-Id: I52eedc8341ce21290254a99c129719d4578a87a6
parents 4a811573 daf39ce8

Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -69,12 +69,19 @@ android_app { 
    name: "ThemePicker",



    static_libs: [

        "guava",

        "monet",

	"renderscript_toolkit",

        "wallpaper-common-deps",

        "SettingsLibSettingsTheme",

        "SystemUI-statsd",

        "styleprotoslite",

    ],



    jni_libs: [

        "librenderscript-toolkit",

    ],



    srcs: [

        ":WallpaperPicker2_srcs",

        ":ThemePicker_srcs",

AndroidManifest.xml

+18 −1
Original line number Diff line number Diff line
@@ -57,9 +57,26 @@ 
            android:theme="@style/CustomizationTheme.NoActionBar"

            android:exported="false"/>



        <activity

            tools:node="replace"

            android:name="com.android.wallpaper.picker.PassThroughCustomizationPickerActivity"

            android:label="@string/app_name"

            android:resizeableActivity="false"

            android:theme="@style/CustomizationTheme.NoActionBar"

            android:exported="false"/>



        <activity

            tools:node="replace"

            android:name="com.android.wallpaper.picker.TrampolinePickerActivity"

            android:label="@string/app_name"

            android:relinquishTaskIdentity="true"

            android:resizeableActivity="false"

            android:theme="@style/CustomizationTheme.NoActionBar"

            android:exported="false"/>



        <activity-alias

            android:name="com.android.customization.picker.CustomizationPickerActivity"

            android:targetActivity="com.android.wallpaper.picker.CustomizationPickerActivity"

            android:targetActivity="com.android.wallpaper.picker.TrampolinePickerActivity"

            android:label="@string/app_name"

            android:exported="true">

             <intent-filter>

res/drawable/color_chip_seed_filled0.xml

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

<!--



     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.

-->

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

    <item>

        <shape android:shape="rectangle">

            <corners

                android:topLeftRadius="@dimen/component_color_chip_small_size_default" />

            <size

                android:width="@dimen/component_color_chip_small_size_default"

                android:height="@dimen/component_color_chip_small_size_default" />

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

        </shape>

    </item>

</selector>
 
 No newline at end of file

res/drawable/color_chip_seed_filled1.xml

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

<!--



     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.

-->

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

    <item>

         <shape android:shape="rectangle">

            <corners

                android:bottomLeftRadius="@dimen/component_color_chip_small_size_default" />

            <size

                android:width="@dimen/component_color_chip_small_size_default"

                android:height="@dimen/component_color_chip_small_size_default" />

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

        </shape>

    </item>

</selector>
 
 No newline at end of file

res/drawable/color_chip_seed_filled2.xml

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

<!--



     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.

-->

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

    <item>

        <shape android:shape="rectangle">

            <corners

                android:topRightRadius="@dimen/component_color_chip_small_size_default" />

            <size

                android:width="@dimen/component_color_chip_small_size_default"

                android:height="@dimen/component_color_chip_small_size_default" />

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

        </shape>

    </item>

</selector>
 
 No newline at end of file