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

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

Update pin pad button colors, font 

Bug: 394136959
Flag: com.android.systemui.bouncer_ui_revamp_2
Test: verified manually
Change-Id: Ida1263b850ed094a2b40143baafa30ae41abfffd
parent 678c7029

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

+14 −16
Original line number Diff line number Diff line
@@ -15,12 +15,6 @@ 
 */

package com.android.keyguard;



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

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

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

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

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



import android.animation.AnimatorSet;

import android.animation.ArgbEvaluator;

import android.animation.ValueAnimator;
@@ -35,7 +29,9 @@ import android.widget.TextView; 


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;



/**

 * Provides background color and radius animations for key pad buttons.
@@ -117,21 +113,23 @@ class NumPadAnimator { 
    void reloadColors(Context context) {

        boolean isNumPadKey = mImageButton == null;



        if (!Flags.bouncerUiRevamp2()) {

            int[] customAttrs = {android.R.attr.colorControlNormal};

            ContextThemeWrapper ctw = new ContextThemeWrapper(context, mStyle);

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



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

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



            a.recycle();

        } else {

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

        }



        mPressedBackgroundColor = context.getColor(NUM_PAD_BACKGROUND_PRESSED);

        mTextColorPressed = context.getColor(NUM_PAD_PRESSED);

        mPressedBackgroundColor = context.getColor(Color.bgPressed);

        mTextColorPressed = context.getColor(Color.digitPressed);



        mBackground.setColor(mNormalBackgroundColor);

        mTextColorPrimary = isNumPadKey

                ? context.getColor(NUM_PAD_KEY)

                : context.getColor(NUM_PAD_BUTTON);

        mTextColorPrimary = context.getColor(isNumPadKey ? Color.digit : Color.action);

        createAnimators();

    }

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

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

package com.android.keyguard;



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

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



import android.content.Context;

import android.content.res.ColorStateList;

import android.content.res.Configuration;
@@ -30,6 +27,8 @@ import android.view.accessibility.AccessibilityNodeInfo; 


import androidx.annotation.Nullable;



import com.android.systemui.Flags;

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

import com.android.systemui.res.R;



/**
@@ -99,7 +98,7 @@ public class NumPadButton extends AlphaOptimizedImageButton implements NumPadAni 
    public void reloadColors() {

        if (mAnimator != null) mAnimator.reloadColors(getContext());



        int textColorResId = mIsTransparentMode ? NUM_PAD_KEY : NUM_PAD_BUTTON;

        int textColorResId = mIsTransparentMode ? Color.actionWithAutoConfirm : Color.action;

        int imageColor = getContext().getColor(textColorResId);

        ((VectorDrawable) getDrawable()).setTintList(ColorStateList.valueOf(imageColor));

    }
@@ -126,7 +125,11 @@ public class NumPadButton extends AlphaOptimizedImageButton implements NumPadAni 
        if (isTransparentMode) {

            setBackgroundColor(getResources().getColor(android.R.color.transparent));

        } else {

            setBackground(getContext().getDrawable(R.drawable.num_pad_key_background));

            Drawable bgDrawable = getContext().getDrawable(R.drawable.num_pad_key_background);

            if (Flags.bouncerUiRevamp2() && bgDrawable != null) {

                bgDrawable.setTint(Color.actionBg);

            }

            setBackground(bgDrawable);

        }

        setupAnimator();

        reloadColors();

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

+4 −3
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
package com.android.keyguard;



import static com.android.systemui.Flags.gsfBouncer;

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



import android.content.Context;

import android.content.res.Configuration;
@@ -38,6 +37,8 @@ import android.widget.TextView; 
import androidx.annotation.Nullable;



import com.android.settingslib.Utils;

import com.android.systemui.Flags;

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

import com.android.systemui.bouncer.ui.helper.BouncerHapticPlayer;

import com.android.systemui.res.R;
@@ -155,11 +156,11 @@ public class NumPadKey extends ViewGroup implements NumPadAnimationListener { 
     * Reload colors from resources.

     **/

    public void reloadColors() {

        int textColor = getContext().getColor(NUM_PAD_KEY);

        int textColor = getContext().getColor(Color.digit);

        int klondikeColor = Utils.getColorAttr(getContext(), android.R.attr.textColorSecondary)

                .getDefaultColor();

        mDigitText.setTextColor(textColor);

        if (gsfBouncer()) {

        if (gsfBouncer() || Flags.bouncerUiRevamp2()) {

            mDigitText.setTypeface(Typeface.create("gsf-label-large-emphasized", Typeface.NORMAL));

        }

        mKlondikeText.setTextColor(klondikeColor);

packages/SystemUI/src/com/android/systemui/bouncer/shared/constants/KeyguardBouncerConstants.kt

+17 −0
Original line number Diff line number Diff line
@@ -19,6 +19,11 @@ package com.android.systemui.bouncer.shared.constants 
import com.android.app.animation.Interpolators

import com.android.internal.R.color as colors

import com.android.systemui.Flags

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

import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_BACKGROUND_PRESSED

import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_BUTTON

import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_KEY

import com.android.systemui.bouncer.shared.constants.KeyguardBouncerConstants.ColorId.NUM_PAD_PRESSED



object KeyguardBouncerConstants {

    /**
@@ -80,6 +85,18 @@ object PinBouncerConstants { 
    object Color {

        @JvmField val hintDot = colors.materialColorOnSurfaceVariant

        @JvmField val shape = colors.materialColorPrimary

        @JvmField val digit = c(old = NUM_PAD_KEY, new = colors.materialColorOnSurface)

        @JvmField

        val digitPressed = c(old = NUM_PAD_PRESSED, new = colors.materialColorOnPrimaryContainer)

        @JvmField

        val digitBg = c(old = NUM_PAD_BACKGROUND, colors.materialColorSurfaceContainerHigh)

        @JvmField

        val bgPressed = c(old = NUM_PAD_BACKGROUND_PRESSED, colors.materialColorPrimaryContainer)

        @JvmField

        val actionWithAutoConfirm = c(old = NUM_PAD_KEY, new = colors.materialColorOnSurface)

        @JvmField val action = c(old = NUM_PAD_BUTTON, new = colors.materialColorOnSecondary)

        @JvmField

        val actionBg = c(old = colors.materialColorSecondaryFixedDim, colors.materialColorSecondary)

    }



    object Animation {