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

Commit 17367274 authored by Matthew Ng's avatar Matthew Ng Committed by android-build-merger
Browse files

Merge "Updates the background of the clear all button for low ram devices" into oc-mr1-dev 

am: 7560cdfb

Change-Id: I20db6dcc6ea8ed2c0ddf4eac6a636c0efbc0dca7
parents e5b610ec 7560cdfb

packages/SystemUI/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
        <attr name="recentItemLayout" format="reference" />

        <!-- Style for the "Clear all" button. -->

        <attr name="clearAllStyle" format="reference" />

        <attr name="clearAllBackgroundColor" format="reference" />

    </declare-styleable>

    <declare-styleable name="DeadZone">

        <attr name="minSize" format="dimension" />

packages/SystemUI/res/values/colors.xml

+5 −0
Original line number Diff line number Diff line
@@ -60,6 +60,11 @@ 
    <!-- The background color for the freeform workspace. -->

    <color name="recents_freeform_workspace_bg_color">#33FFFFFF</color>



    <!-- The background color for clear all button on light backgrounds if not transparent. -->

    <color name="recents_clear_all_button_bg_light_color">#CCFFFFFF</color>

    <!-- The background color for clear all button on dark backgrounds if not transparent. -->

    <color name="recents_clear_all_button_bg_dark_color">#CC000000</color>



    <color name="keyguard_affordance">#ffffffff</color>



    <!-- The color of the legacy notification background -->

packages/SystemUI/res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -34,11 +34,13 @@ 
        <item name="android:windowShowWallpaper">true</item>

        <item name="android:windowDisablePreview">true</item>

        <item name="clearAllStyle">@style/ClearAllButtonDefaultMargins</item>

        <item name="clearAllBackgroundColor">@color/recents_clear_all_button_bg_dark_color</item>

        <item name="wallpaperTextColor">@*android:color/primary_text_material_dark</item>

        <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_dark</item>

    </style>



    <style name="RecentsTheme.Wallpaper.Light">

        <item name="clearAllBackgroundColor">@color/recents_clear_all_button_bg_light_color</item>

        <item name="wallpaperTextColor">@*android:color/primary_text_material_light</item>

        <item name="wallpaperTextColorSecondary">@*android:color/secondary_text_material_light</item>

    </style>

packages/SystemUI/src/com/android/systemui/recents/views/RecentsView.java

+4 −0
Original line number Diff line number Diff line
@@ -205,6 +205,10 @@ public class RecentsView extends FrameLayout { 
                        mStackButtonShadowDistance.x, mStackButtonShadowDistance.y,

                        mStackButtonShadowColor);

            }

            if (Recents.getConfiguration().isLowRamDevice) {

                int bgColor = Utils.getColorAttr(mContext, R.attr.clearAllBackgroundColor);

                mStackActionButton.setBackgroundColor(bgColor);

            }

        }



        // Let's also require dark status and nav bars if the text is dark