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

Commit b9309ed2 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30827731']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/30827731'] into sparse-12774339-L91900030008293772.
SPARSE_CHANGE: Iec4f8a2ccb97e8f7a50731555e1d1849090c550f

Change-Id: I5d4d2a180a142694abd268d202bc4b2d247a3d09
parents 0308f4f4 91d8d5d7

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