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

Commit 1ddd16e0 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

Merge "Remove hardcoded color for tuner and emergency call"

parents 1dbb3f11 9cbffcba

packages/SystemUI/res/drawable-nodpi/tuner.xml

+2 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M22.7,19.0l-9.1,-9.1c0.9,-2.0 0.4,-5.0 -1.5,-6.9 -2.0,-2.0 -5.0,-2.4 -7.4,-1.3L9.0,6.0 6.0,9.0 1.6,4.7C0.4,7.0 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1.0,0.4 1.4,0.0l2.3,-2.3c0.5,-0.4 0.5,-1.0 0.1,-1.4z"/>

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+5 −4
Original line number Diff line number Diff line
@@ -72,19 +72,20 @@ 
            android:clipChildren="false"

            android:clipToPadding="false">



            <com.android.systemui.statusbar.phone.SettingsButton android:id="@+id/settings_button"

            <com.android.systemui.statusbar.phone.SettingsButton

                android:id="@+id/settings_button"

                style="@android:style/Widget.Material.Button.Borderless"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:background="@drawable/ripple_drawable"

                android:src="@drawable/ic_settings_20dp"

                android:contentDescription="@string/accessibility_quick_settings_settings" />

            <com.android.systemui.statusbar.AlphaOptimizedImageView android:id="@+id/tuner_icon"

            <com.android.systemui.statusbar.AlphaOptimizedImageView

                android:id="@+id/tuner_icon"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:paddingStart="36dp"

                android:tint="#4DFFFFFF"

                android:tintMode="src_in"

                android:alpha="0.3"

                android:visibility="invisible"

                android:src="@drawable/tuner" />

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ 
    <style name="TextAppearance.StatusBar.Expanded.AboveDateTime">

        <item name="android:textSize">@dimen/qs_emergency_calls_only_text_size</item>

        <item name="android:textStyle">normal</item>

        <item name="android:textColor">#66ffffff</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

    </style>



    <style name="TextAppearance.StatusBar.Expanded.EmergencyCallsOnly"