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

Commit d9d89010 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Update Spinner and Progressbar style to adopt Material Next style."

parents 1b23d084 24fbcea5

packages/SettingsLib/SettingsSpinner/res/layout/settings_spinner_dropdown_view.xml→packages/SettingsLib/SettingsSpinner/res/layout-v31/settings_spinner_dropdown_view.xml

+3 −4
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) 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.
@@ -18,8 +18,7 @@ 
<TextView

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

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

    style="@style/SettingsSpinnerTitleBar"

    style="@style/SettingsSpinnerDropdown"

    android:gravity="center_vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

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

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

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    android:layout_marginStart="16dp"

    android:layout_marginEnd="16dp">



    <com.android.settingslib.widget.settingsspinner.SettingsSpinner

    <Spinner

        android:id="@+id/spinner"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

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

deleted100644 → 0
+0 −19
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→packages/SettingsLib/SettingsSpinner/res/values-v31/colors.xml

+3 −2
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) 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.
@@ -15,5 +15,6 @@ 
-->



<resources>

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

    <color name="settingslib_spinner_title_color">@android:color/system_neutral1_900</color>

    <color name="settingslib_spinner_dropdown_color">@android:color/system_neutral2_700</color>

</resources>

packages/SettingsLib/SettingsSpinner/res/values-v31/styles.xml

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

  -->



<resources>

    <style name="SettingsSpinnerTitleBar">

        <item name="android:textAppearance">?android:attr/textAppearanceButton</item>

        <item name="android:textColor">@color/settingslib_spinner_title_color</item>

        <item name="android:maxLines">1</item>

        <item name="android:ellipsize">marquee</item>

        <item name="android:minHeight">@dimen/spinner_height</item>

        <item name="android:paddingStart">16dp</item>

        <item name="android:paddingEnd">36dp</item>

        <item name="android:paddingTop">@dimen/spinner_padding_top_or_bottom</item>

        <item name="android:paddingBottom">@dimen/spinner_padding_top_or_bottom</item>

    </style>



    <style name="SettingsSpinnerDropdown">

        <item name="android:textAppearance">?android:attr/textAppearanceButton</item>

        <item name="android:textColor">@color/settingslib_spinner_dropdown_color</item>

        <item name="android:maxLines">1</item>

        <item name="android:ellipsize">marquee</item>

        <item name="android:minHeight">@dimen/spinner_height</item>

        <item name="android:paddingStart">16dp</item>

        <item name="android:paddingEnd">36dp</item>

        <item name="android:paddingTop">@dimen/spinner_padding_top_or_bottom</item>

        <item name="android:paddingBottom">@dimen/spinner_padding_top_or_bottom</item>

    </style>

</resources>