Fix tinting and sizing of tuner lock screen shortcuts
Test: visual
Change-Id: I13f0281d38cd4d73322e9752d9bca36be2412917
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
index 8b4225a..b15f090 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/KeyguardAffordanceView.java
@@ -21,6 +21,7 @@
import android.animation.ArgbEvaluator;
import android.animation.PropertyValuesHolder;
import android.animation.ValueAnimator;
+import android.annotation.Nullable;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.CanvasProperty;
@@ -78,6 +79,7 @@
private boolean mSupportHardware;
private boolean mFinishing;
private boolean mLaunchingAffordance;
+ private boolean mShouldTint = true;
private CanvasProperty<Float> mHwCircleRadius;
private CanvasProperty<Float> mHwCenterX;
@@ -137,6 +139,12 @@
mFlingAnimationUtils = new FlingAnimationUtils(mContext, 0.3f);
}
+ public void setImageDrawable(@Nullable Drawable drawable, boolean tint) {
+ super.setImageDrawable(drawable);
+ mShouldTint = tint;
+ updateIconColor();
+ }
+
@Override
protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
super.onLayout(changed, left, top, right, bottom);
@@ -165,6 +173,7 @@
}
private void updateIconColor() {
+ if (!mShouldTint) return;
Drawable drawable = getDrawable().mutate();
float alpha = mCircleRadius / mMinBackgroundRadius;
alpha = Math.min(1.0f, alpha);