Merge "Always update lockscreen UDFPS icon's progress" into tm-dev am: 3f28fc9946
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17886259 Change-Id: I455db8d1cc86f4736b857d6a4f07936ddd3c7383 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -128,10 +128,6 @@ public class UdfpsKeyguardView extends UdfpsAnimationView {
|
|||||||
|
|
||||||
if (mAnimatingBetweenAodAndLockscreen && !mPauseAuth) {
|
if (mAnimatingBetweenAodAndLockscreen && !mPauseAuth) {
|
||||||
mBgProtection.setAlpha(1f - mInterpolatedDarkAmount);
|
mBgProtection.setAlpha(1f - mInterpolatedDarkAmount);
|
||||||
|
|
||||||
mLockScreenFp.setTranslationX(mBurnInOffsetX);
|
|
||||||
mLockScreenFp.setTranslationY(mBurnInOffsetY);
|
|
||||||
mLockScreenFp.setProgress(1f - mInterpolatedDarkAmount);
|
|
||||||
mLockScreenFp.setAlpha(1f - mInterpolatedDarkAmount);
|
mLockScreenFp.setAlpha(1f - mInterpolatedDarkAmount);
|
||||||
} else if (mInterpolatedDarkAmount == 0f) {
|
} else if (mInterpolatedDarkAmount == 0f) {
|
||||||
mBgProtection.setAlpha(mAlpha / 255f);
|
mBgProtection.setAlpha(mAlpha / 255f);
|
||||||
@@ -140,6 +136,9 @@ public class UdfpsKeyguardView extends UdfpsAnimationView {
|
|||||||
mBgProtection.setAlpha(0f);
|
mBgProtection.setAlpha(0f);
|
||||||
mLockScreenFp.setAlpha(0f);
|
mLockScreenFp.setAlpha(0f);
|
||||||
}
|
}
|
||||||
|
mLockScreenFp.setTranslationX(mBurnInOffsetX);
|
||||||
|
mLockScreenFp.setTranslationY(mBurnInOffsetY);
|
||||||
|
mLockScreenFp.setProgress(1f - mInterpolatedDarkAmount);
|
||||||
|
|
||||||
mAodFp.setTranslationX(mBurnInOffsetX);
|
mAodFp.setTranslationX(mBurnInOffsetX);
|
||||||
mAodFp.setTranslationY(mBurnInOffsetY);
|
mAodFp.setTranslationY(mBurnInOffsetY);
|
||||||
|
|||||||
Reference in New Issue
Block a user