diff options
| author | 2022-04-27 12:55:20 +0000 | |
|---|---|---|
| committer | 2022-04-27 12:55:20 +0000 | |
| commit | 8e96c8fc23c246d409a4423bd77469b3c4b731aa (patch) | |
| tree | 36993eb40bfb12eab27a9c924b33b7027e7c57f4 | |
| parent | e6474ba2a113ded8f70cf4e8aa672a96207f6453 (diff) | |
| parent | a3193ed1db1b077635d95d0983bec7685ab8176e (diff) | |
Merge "Set burn-in offsets to 0 if darkAmount=0" into tm-dev am: a3193ed1db
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17956044
Change-Id: Ifaacae521fbb0168ed7d802bed4c398c4a94d1c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java index 842791f8ed93..937b81337cbb 100644 --- a/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java +++ b/packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java @@ -127,17 +127,19 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { mBurnInProgress = MathUtils.lerp(0f, getBurnInProgressOffset(), darkAmountForAnimation); if (mAnimatingBetweenAodAndLockscreen && !mPauseAuth) { + mLockScreenFp.setTranslationX(mBurnInOffsetX); + mLockScreenFp.setTranslationY(mBurnInOffsetY); mBgProtection.setAlpha(1f - mInterpolatedDarkAmount); mLockScreenFp.setAlpha(1f - mInterpolatedDarkAmount); } else if (mInterpolatedDarkAmount == 0f) { + mLockScreenFp.setTranslationX(0); + mLockScreenFp.setTranslationY(0); mBgProtection.setAlpha(mAlpha / 255f); mLockScreenFp.setAlpha(mAlpha / 255f); } else { mBgProtection.setAlpha(0f); mLockScreenFp.setAlpha(0f); } - mLockScreenFp.setTranslationX(mBurnInOffsetX); - mLockScreenFp.setTranslationY(mBurnInOffsetY); mLockScreenFp.setProgress(1f - mInterpolatedDarkAmount); mAodFp.setTranslationX(mBurnInOffsetX); |