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

Commit 1bf3ed87 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Shows ripple inside SettingsSpinner and its dropdown items" into sc-dev am: 1f26477a 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15125792

Change-Id: Ie76925495d7ba30e4a57a3d067d04ee22a55422b
parents 63e0f357 1f26477a

packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_background.xml

+23 −21
Original line number Diff line number Diff line
@@ -15,21 +15,21 @@ 
  limitations under the License.

  -->



<layer-list

<ripple

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

    xmlns:priv-android="http://schemas.android.com/apk/prv/res/android"

    android:paddingMode="stack">

    android:color="@color/ripple_color">



    <item android:id="@android:id/background">

        <layer-list android:paddingMode="stack">

            <item

                android:top="8dp"

                android:bottom="8dp">



                <shape>

            <corners

                android:radius="28dp"/>

            <solid

                android:color="?priv-android:attr/colorAccentPrimary"/>

            <size

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

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

                    <solid android:color="?priv-android:attr/colorAccentPrimary"/>

                    <size android:height="@dimen/spinner_height"/>

                </shape>

            </item>
@@ -40,3 +40,5 @@ 
                android:end="8dp"

                android:drawable="@drawable/arrow_drop_down"/>

        </layer-list>

    </item>

</ripple>

packages/SettingsLib/SettingsSpinner/res/drawable/settings_spinner_dropdown_background.xml

+7 −8
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2021 The Android Open Source Project

  Copyright (C) 2018 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.
@@ -15,15 +15,14 @@ 
  limitations under the License.

  -->



<layer-list

<ripple

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

    xmlns:priv-android="http://schemas.android.com/apk/prv/res/android">

    xmlns:priv-android="http://schemas.android.com/apk/prv/res/android"

    android:color="@color/ripple_color">



    <item>

    <item android:id="@android:id/background">

        <shape>

            <solid

                android:color="?priv-android:attr/colorAccentSecondary"/>

            <solid android:color="?priv-android:attr/colorAccentSecondary"/>

        </shape>

    </item>



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

packages/SettingsLib/SettingsSpinner/res/values-night/colors.xml

0 → 100644
+19 −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.

-->



<resources>

    <color name="ripple_color">@*android:color/material_grey_900</color>

</resources>

packages/SettingsLib/SettingsSpinner/res/values/colors.xml

0 → 100644
+19 −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.

-->



<resources>

    <color name="ripple_color">?android:attr/colorControlHighlight</color>

</resources>