Avoid screen edges when moving padlock
Test: visual
Change-Id: I28a62157b1651e79f5d48513e0884f662b9478fe
Fixes: 119553778
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
index 5439497..21c506b 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
@@ -54,6 +54,7 @@
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.Log;
+import android.util.MathUtils;
import android.util.TypedValue;
import android.view.View;
import android.view.ViewGroup;
@@ -568,6 +569,7 @@
mDarkAmount = darkAmount;
mIndicationController.setDarkAmount(darkAmount);
mLockIcon.setDarkAmount(darkAmount);
+ dozeTimeTick();
}
private static boolean isSuccessfulLaunch(int result) {
@@ -840,12 +842,10 @@
}
public void dozeTimeTick() {
- if (mDarkAmount == 1) {
- // Move views every minute to avoid burn-in
- int burnInYOffset = getBurnInOffset(mBurnInYOffset * 2, false /* xAxis */)
- - mBurnInYOffset;
- mLockIcon.setTranslationY(burnInYOffset);
- }
+ // Move views every minute to avoid burn-in
+ int burnInYOffset = -getBurnInOffset(mBurnInYOffset, false /* xAxis */);
+ burnInYOffset = (int) MathUtils.lerp(0, burnInYOffset, mDarkAmount);
+ mLockIcon.setTranslationY(burnInYOffset);
}
public void setBurnInXOffset(int burnInXOffset) {