Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6462aa39 authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Set burn-in offsets to 0 if darkAmount=0" into tm-dev am: a3193ed1 am: 8e96c8fc 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17956044



Change-Id: I59347d8dd4a6aa0ac685926672aae10d59dd7a00
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b158f735 8e96c8fc

packages/SystemUI/src/com/android/systemui/biometrics/UdfpsKeyguardView.java

+4 −2
Original line number Diff line number Diff line
@@ -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);