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

Commit ddb05590 authored by Lucas Dupin's avatar Lucas Dupin Committed by Automerger Merge Worker
Browse files

Merge "Fix colors for a11y" into sc-dev am: 1cee5ddc 

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

Change-Id: I8089ce3b96d83ef974a5663f95bdb6a5c8159616
parents 1368cc47 1cee5ddc

packages/SystemUI/res/drawable/brightness_progress_full_drawable.xml

+2 −2
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
        android:right="@dimen/rounded_slider_icon_inset">

        <com.android.systemui.util.AlphaTintDrawableWrapper

            android:drawable="@drawable/ic_brightness"

            android:tint="?android:attr/colorBackground"

            android:alpha="0.8"/>

            android:tint="?android:attr/textColorPrimaryInverse"

        />

    </item>

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

packages/SystemUI/res/drawable/qs_footer_action_chip_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
        </item>

        <item>

            <shape android:shape="rectangle">

                <stroke android:width="1dp" android:color="@color/qs_footer_action_border"/>

                <stroke android:width="1dp" android:color="?android:attr/colorBackground"/>

                <corners android:radius="@dimen/qs_footer_action_corner_radius"/>

            </shape>

        </item>

packages/SystemUI/res/layout/qs_footer_impl.xml

+3 −3
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
                android:focusable="true"

                android:padding="@dimen/qs_footer_icon_padding"

                android:src="@*android:drawable/ic_mode_edit"

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

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



            <com.android.systemui.statusbar.phone.MultiUserSwitch

                android:id="@+id/multi_user_switch"
@@ -126,7 +126,7 @@ 
                    android:padding="@dimen/qs_footer_icon_padding"

                    android:scaleType="centerInside"

                    android:src="@drawable/ic_settings"

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

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



                <com.android.systemui.statusbar.AlphaOptimizedImageView

                    android:id="@+id/tuner_icon"
@@ -152,7 +152,7 @@ 
                android:padding="@dimen/qs_footer_icon_padding"

                android:src="@*android:drawable/ic_lock_power_off"

                android:contentDescription="@string/accessibility_quick_settings_power_menu"

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

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



        </LinearLayout>

    </LinearLayout>

packages/SystemUI/res/values/colors.xml

+0 −1
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
    <color name="status_bar_clock_color">#FFFFFFFF</color>

    <color name="qs_user_detail_icon_muted">#FFFFFFFF</color> <!-- not so muted after all -->

    <color name="qs_tile_disabled_color">#9E9E9E</color> <!-- 38% black -->

    <color name="qs_footer_action_border">#2E312C</color>



    <!-- The color of the background in the separated list of the Global Actions menu -->

    <color name="global_actions_separated_background">#F5F5F5</color>

packages/SystemUI/res/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ 
    </style>



    <style name="TextAppearance.QS.Status.NoCarrierText">

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

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

    </style>



    <style name="TextAppearance.QS.Build">