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

Commit 2c7e8787 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 13 QPR3 

Bug: 275386652
Merged-In: Idbb8b1d3e453c937f118dc74a0db153f867dd506
Change-Id: Ic145e8e819b40ef0a48c2dbfb3244322e72edeee
parents 28d8047b b21dba71

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ java_defaults { 
        "SettingsLibSettingsTheme",

        "SystemUI-statsd",

        "styleprotoslite",

        "androidx.lifecycle_lifecycle-livedata-ktx",

        "androidx.lifecycle_lifecycle-runtime-ktx",

        "androidx.lifecycle_lifecycle-viewmodel-ktx",

        "androidx.recyclerview_recyclerview",

ktfmt_includes.txt

+1 −0
Original line number Diff line number Diff line 
+src/

+src_override/

+tests/

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

res/drawable/color_option_selected_no_background.xml

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

<!--



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

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:height="@dimen/component_color_selected_small_diameter_default"

        android:width="@dimen/component_color_selected_small_diameter_default"

        android:gravity="center">

        <shape

            android:shape="ring"

            android:innerRadius="@dimen/component_color_overflow_small_radius_default"

            android:thickness="2dp"

            android:useLevel="false">

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

        </shape>

    </item>

    <item

        android:height="@dimen/component_color_selected_small_diameter_default"

        android:width="@dimen/component_color_selected_small_diameter_default"

        android:gravity="center">

        <shape

            android:shape="ring"

            android:innerRadius="@dimen/component_color_overflow_small_radius_default"

            android:thickness="-3dp"

            android:useLevel="false">

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

        </shape>

    </item>

</layer-list>
 
 No newline at end of file

res/drawable/color_overflow.xml

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

<!--



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

-->

<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item

        android:height="@dimen/component_color_overflow_small_diameter_default"

        android:width="@dimen/component_color_overflow_small_diameter_default"

        android:gravity="center">

        <shape

            android:shape="ring"

            android:innerRadius="@dimen/component_color_overflow_small_radius_default"

            android:thickness="-1dp"

            android:useLevel="false">

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

        </shape>

    </item>

    <item

        android:drawable="@drawable/ic_more_horiz"

        android:gravity="center"/>

</layer-list>
 
 No newline at end of file