Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Check class type before creating animator" into tm-dev am: 0e76941f06

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17127404

Change-Id: I28aa9c612142103853efe2b57df6976aa4ee1d81
This commit is contained in:
TreeHugger Robot
2022-03-09 21:50:31 +00:00
committed by Automerger Merge Worker
parent 6625585082 0e76941f06
commit ceae0d9272
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/keyguard/NumPadButton.java
View File

@@ -19,6 +19,8 @@ import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.graphics.drawable.VectorDrawable;
import android.util.AttributeSet;
import android.view.MotionEvent;
@@ -37,8 +39,14 @@ public class NumPadButton extends AlphaOptimizedImageButton {
public NumPadButton(Context context, AttributeSet attrs) {
super(context, attrs);
mAnimator = new NumPadAnimator(context, getBackground().mutate(),
attrs.getStyleAttribute());
Drawable background = getBackground();
if (background instanceof GradientDrawable) {
mAnimator = new NumPadAnimator(context, background.mutate(),
attrs.getStyleAttribute());
} else {
mAnimator = null;
}
}
@Override

11
packages/SystemUI/src/com/android/keyguard/NumPadKey.java
View File

@@ -18,6 +18,8 @@ package com.android.keyguard;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.graphics.drawable.GradientDrawable;
import android.os.PowerManager;
import android.os.SystemClock;
import android.util.AttributeSet;
@@ -129,8 +131,13 @@ public class NumPadKey extends ViewGroup {
setContentDescription(mDigitText.getText().toString());
mAnimator = new NumPadAnimator(context, getBackground().mutate(),
R.style.NumPadKey, mDigitText);
Drawable background = getBackground();
if (background instanceof GradientDrawable) {
mAnimator = new NumPadAnimator(context, background.mutate(),
R.style.NumPadKey, mDigitText);
} else {
mAnimator = null;
}
}
@Override