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

Commit 3c4ae85c authored by Marcelo Arteiro's avatar Marcelo Arteiro Committed by Android (Google) Code Review
Browse files

Merge "Fix numPadAnimator bug when colorControlNormal isn't found." into main

parents 10b79530 bd9f5b1f
Loading
Loading
Loading
Loading
+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);