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

Commit bd9f5b1f authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Chandru S
Browse files

Fix numPadAnimator bug when colorControlNormal isn't found. 

This resulted in the enter and delete buttons with wrong colors in keyguard.

Change-Id: Iec4f8a2ccb97e8f7a50731555e1d1849090c550f
Test: manually
Bug: 383230490
Flag: EXEMPT bugfix
parent dcdcc3a0

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

+7 −1
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ import android.animation.AnimatorSet; 
import android.animation.ArgbEvaluator;

import android.animation.ValueAnimator;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.GradientDrawable;

import android.view.ContextThemeWrapper;
@@ -122,7 +124,11 @@ class NumPadAnimator { 


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

        ContextThemeWrapper ctw = new ContextThemeWrapper(context, mStyle);

        mNormalBackgroundColor = ctw.getColor(NUM_PAD_BACKGROUND);

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



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



        a.recycle();



        mPressedBackgroundColor = context.getColor(NUM_PAD_BACKGROUND_PRESSED);

        mTextColorPressed = context.getColor(NUM_PAD_PRESSED);