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

Commit d62d364f authored by Chandru S's avatar Chandru S
Browse files

Update bouncer bg, button, fallback colors to match spec 

Also updates couple of colors to comply with a11y contrast ratios.

Flag: com.android.systemui.bouncer_ui_revamp
Test: verified manually
Fixes: 414531398
Fixes: 414531190
Fixes: 406464411
Change-Id: I219e6dd1319237d4356c7cb597820091c5ea6dd7
parent 1abda4f2

packages/SystemUI/res-keyguard/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
        <item name="android:textAlignment">center</item>

        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

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

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

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

    </style>

    <style name="Keyguard.TextView.EmergencyButton" parent="Theme.SystemUI">

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

packages/SystemUI/res/values-night/colors.xml

+4 −0
Original line number Diff line number Diff line
@@ -113,6 +113,10 @@ 
    <color name="qs_user_switcher_avatar_background">#3C4043</color>

    <!-- Color of border for keyguard password input when focused -->

    <color name="bouncer_password_focus_color">@*android:color/system_secondary_dark</color>

    <!-- BG color for confirm and backspace button in non-auto confirm PIN bouncer.   -->

    <color name="pin_bouncer_action_button_bg">@androidprv:color/surface_effect_3</color>

    <!-- Bouncer background when blur is not enabled.   -->

    <color name="bouncer_fallback_bg">@android:color/system_accent1_800</color>



    <!-- Accessibility floating menu -->

    <color name="accessibility_floating_menu_background">#B3000000</color> <!-- 70% -->

packages/SystemUI/res/values/colors.xml

+5 −0
Original line number Diff line number Diff line
@@ -283,4 +283,9 @@ 
    <!-- Low light Dream -->

    <color name="low_light_clock_background_color">#000000</color>

    <color name="low_light_clock_text_color">#CCCCCC</color>



    <!-- BG color for confirm and backspace button in non-auto confirm PIN bouncer.   -->

    <color name="pin_bouncer_action_button_bg">@androidprv:color/surface_effect_0</color>

    <!-- Bouncer background when blur is not enabled.   -->

    <color name="bouncer_fallback_bg">@android:color/system_accent2_200</color>

</resources>

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+9 −2
Original line number Diff line number Diff line
@@ -98,8 +98,10 @@ import com.android.internal.widget.LockPatternUtils; 
import com.android.keyguard.KeyguardSecurityModel.SecurityMode;

import com.android.settingslib.Utils;

import com.android.settingslib.drawable.CircleFramedDrawable;

import com.android.systemui.Flags;

import com.android.systemui.FontStyles;

import com.android.systemui.Gefingerpoken;

import com.android.systemui.bouncer.ui.BouncerColors;

import com.android.systemui.classifier.FalsingA11yDelegate;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.res.R;
@@ -852,9 +854,14 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
    private void reloadBackgroundColor() {

        if (mTransparentModeEnabled) {

            setBackgroundColor(Color.TRANSPARENT);

        } else {

            if (Flags.bouncerUiRevamp2()) {

                setBackgroundColor(BouncerColors.surfaceColor(mContext, false));

            } else {

                setBackgroundColor(

                    getContext().getColor(com.android.internal.R.color.materialColorSurfaceDim));

                        getContext().getColor(

                                com.android.internal.R.color.materialColorSurfaceDim));

            }

        }

        invalidate();

    }

packages/SystemUI/src/com/android/keyguard/NumPadAnimator.java

+6 −2
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 
 */

package com.android.keyguard;



import static com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_BACKGROUND;



import android.animation.Animator;

import android.animation.AnimatorSet;

import android.animation.ArgbEvaluator;
@@ -33,6 +35,7 @@ import androidx.annotation.StyleRes; 
import com.android.systemui.Flags;

import com.android.systemui.bouncer.shared.constants.PinBouncerConstants.Animation;

import com.android.systemui.bouncer.shared.constants.PinBouncerConstants.Color;

import com.android.systemui.bouncer.ui.BouncerColors;



import java.util.ArrayList;

import java.util.List;
@@ -122,11 +125,12 @@ class NumPadAnimator { 
            ContextThemeWrapper ctw = new ContextThemeWrapper(context, mStyle);

            @SuppressLint("ResourceType") TypedArray a = ctw.obtainStyledAttributes(customAttrs);



            mNormalBackgroundColor = a.getColor(0, context.getColor(Color.digitBg));

            mNormalBackgroundColor = a.getColor(0, context.getColor(NUM_PAD_BACKGROUND));



            a.recycle();

        } else {

            mNormalBackgroundColor = context.getColor(isNumPadKey ? Color.digitBg : Color.actionBg);

            mNormalBackgroundColor = isNumPadKey ? BouncerColors.pinDigitBg(context)

                            : BouncerColors.pinActionBg(context);

        }



        mPressedBackgroundColor = context.getColor(Color.bgPressed);