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

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

Merge 24Q4 into AOSP main 

Bug: 370570306
Merged-In: I9a0a0344ea49b0ef050834f418fdfa16d4e4375e
Change-Id: I1d39cc542e3af6132821a800e901e15ed8f88f1d
parents a522dc5a 0483351f

AndroidManifest.xml

+10 −0
Original line number Diff line number Diff line
@@ -80,6 +80,16 @@ 
            android:theme="@style/CustomizationTheme.NoActionBar"

            android:exported="false"/>



        <activity

            tools:node="replace"

            android:name="com.android.wallpaper.picker.customization.ui.CustomizationPickerActivity2"

            android:label="@string/app_name"

            android:relinquishTaskIdentity="true"

            android:resizeableActivity="false"

            android:theme="@style/WallpaperTheme"

            android:configChanges="assetsPaths"

            android:exported="false"/>



        <activity

            tools:node="replace"

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

res/drawable/color_overflow.xml

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

            android:shape="ring"

            android:innerRadius="@dimen/component_color_overflow_small_radius_default"

            android:thickness="-1dp"

            android:thickness="-2dp"

            android:useLevel="false">

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

        </shape>

res/drawable/customization_option_entry_icon_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,6 +16,6 @@ 


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

    android:shape="rectangle">

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

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

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

</shape>
 
 No newline at end of file

res/drawable/horizontal_divider_16dp.xml

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

<!--

     Copyright (C) 2021 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.

-->

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

    <size

        android:width="16dp"

        android:height="0dp" />

</shape>

res/drawable/horizontal_divider_4dp.xml

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

<!--

     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.

-->

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

    <size

        android:width="4dp"

        android:height="0dp" />

</shape>