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

Commit fd8e9f9b authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Update Spinner font and color" into tm-dev am: 194d7396 am: d8c17f68 

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



Change-Id: I2b6ba93a29df43574cef3ecdb52096b5b56701ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 58dac7d4 d8c17f68

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

+4 −2
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 


<resources>

    <style name="SettingsSpinnerTitleBar">

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

        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item>

        <item name="android:textSize">16sp</item>

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

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

        <item name="android:ellipsize">marquee</item>
@@ -29,7 +30,8 @@ 
    </style>



    <style name="SettingsSpinnerDropdown">

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

        <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Medium</item>

        <item name="android:textSize">16sp</item>

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

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

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

packages/SettingsLib/res/layout/user_preference.xml

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

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

-->



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

        android:id="@android:id/widget_frame"

        android:layout_width="match_parent"

        android:layout_height="@dimen/user_spinner_item_height"

        android:paddingStart="@dimen/user_spinner_padding_sides"

        android:paddingEnd="@dimen/user_spinner_padding_sides"

        android:orientation="horizontal" >



    <ImageView

            android:id="@android:id/icon"

            android:layout_width="@dimen/user_icon_view_height"

            android:layout_height="@dimen/user_icon_view_height"

            android:layout_gravity="center"

            android:scaleType="fitCenter" />



    <TextView

            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:layout_gravity="center"

            android:labelFor="@android:id/icon"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:paddingStart="@dimen/user_spinner_padding"

            android:paddingEnd="@dimen/user_spinner_padding"

            android:textAppearance="?android:attr/textAppearanceMedium" />



</LinearLayout>