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

Commit 91d8d5d7 authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Android Build Coastguard Worker
Browse files

Fix numPadAnimator bug when colorControlNormal isn't found. 

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

Test: manually
Bug: 383230490
Flag: EXEMPT bugfix
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:bd9f5b1fbe9b272ebeecf80f5ed17bbc3ede1e14)
Merged-In: Iec4f8a2ccb97e8f7a50731555e1d1849090c550f
Change-Id: Iec4f8a2ccb97e8f7a50731555e1d1849090c550f
parent 0308f4f4

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

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

import android.animation.ArgbEvaluator;

import android.animation.ValueAnimator;

import android.animation.ValueAnimator;

import android.annotation.Nullable;

import android.annotation.Nullable;

import android.annotation.SuppressLint;

import android.content.Context;

import android.content.Context;

import android.content.res.TypedArray;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.Drawable;

import android.graphics.drawable.GradientDrawable;

import android.graphics.drawable.GradientDrawable;

import android.view.ContextThemeWrapper;

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




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

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

        ContextThemeWrapper ctw = new ContextThemeWrapper(context, mStyle);

        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);

        mPressedBackgroundColor = context.getColor(NUM_PAD_BACKGROUND_PRESSED);

        mTextColorPressed = context.getColor(NUM_PAD_PRESSED);

        mTextColorPressed = context.getColor(NUM_PAD_PRESSED);