Merge "Set burn-in offsets to 0 if darkAmount=0" into tm-dev
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user