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

Commit d62d31ac authored by Arc Wang's avatar Arc Wang Committed by Automerger Merge Worker
Browse files

Merge "Tweak SettingsSpinner UI" into sc-dev am: 39665ed5 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I123a3208411e66fa2e39cdfe6217093840b839e4
parents 5a82aab2 39665ed5

packages/SettingsLib/SettingsSpinner/res/drawable/arrow_drop_down_24dp.xml→packages/SettingsLib/SettingsSpinner/res/drawable/arrow_drop_down.xml

+4 −4
Original line number Diff line number Diff line
@@ -16,11 +16,11 @@ 
  -->



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

        android:viewportWidth="24"

        android:viewportHeight="24"

        android:viewportWidth="18"

        android:viewportHeight="18"

        android:width="24dp"

        android:height="24dp">

    <path

        android:pathData="M7 10l5 5 5 -5z"

        android:fillColor="?android:attr/textColorPrimary"/>

        android:fillColor="@android:color/black"/>

</vector>

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

+8 −8
Original line number Diff line number Diff line
@@ -24,21 +24,21 @@ 
        android:bottom="8dp">

        <shape>

            <corners

                android:radius="20dp"/>

                android:radius="28dp"/>

            <solid

                android:color="?android:attr/colorPrimary"/>

                android:color="?android:attr/colorAccent"/>

            <stroke

                android:color="#1f000000"

                android:color="?android:attr/colorPrimary"

                android:width="1dp"/>

            <size

                android:height="32dp"/>

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

        </shape>

    </item>



    <item

        android:gravity="center|end"

        android:width="24dp"

        android:height="24dp"

        android:end="4dp"

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

        android:width="18dp"

        android:height="18dp"

        android:end="8dp"

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

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

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

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

  -->



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



    <item>

        <shape>

            <solid

                android:color="?android:attr/colorAccent"/>

        </shape>

    </item>



    <item>

        <shape>

            <solid android:color="#BBFFFFFF"/>

        </shape>

    </item>



</layer-list>

packages/SettingsLib/SettingsSpinner/res/layout/settings_spinner_dropdown_view.xml

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

-->



<TextView

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

    android:id="@android:id/text1"

    style="@style/SettingsSpinnerTitleBar"

    android:gravity="center_vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@drawable/settings_spinner_dropdown_background"/>

packages/SettingsLib/SettingsSpinner/res/layout/settings_spinner_view.xml

+1 −3
Original line number Diff line number Diff line
@@ -19,7 +19,5 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@android:id/text1"

    style="@style/SettingsSpinnerTitleBar"

    android:maxLines="1"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:ellipsize="marquee"/>
 
    android:layout_height="wrap_content"/>