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

Commit 5e741dcb authored by Beverly Tai's avatar Beverly Tai Committed by Automerger Merge Worker
Browse files

Merge "Always update lockscreen UDFPS icon's progress" into tm-dev am: 3f28fc99 am: c161196c 

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



Change-Id: I150d8397f082c0273d6a5548140ff32c0ccf322c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4bdf8450 c161196c

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

+3 −4
Original line number Diff line number Diff line
@@ -128,10 +128,6 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { 


        if (mAnimatingBetweenAodAndLockscreen && !mPauseAuth) {

            mBgProtection.setAlpha(1f - mInterpolatedDarkAmount);



            mLockScreenFp.setTranslationX(mBurnInOffsetX);

            mLockScreenFp.setTranslationY(mBurnInOffsetY);

            mLockScreenFp.setProgress(1f - mInterpolatedDarkAmount);

            mLockScreenFp.setAlpha(1f - mInterpolatedDarkAmount);

        } else if (mInterpolatedDarkAmount == 0f) {

            mBgProtection.setAlpha(mAlpha / 255f);
@@ -140,6 +136,9 @@ public class UdfpsKeyguardView extends UdfpsAnimationView { 
            mBgProtection.setAlpha(0f);

            mLockScreenFp.setAlpha(0f);

        }

        mLockScreenFp.setTranslationX(mBurnInOffsetX);

        mLockScreenFp.setTranslationY(mBurnInOffsetY);

        mLockScreenFp.setProgress(1f - mInterpolatedDarkAmount);



        mAodFp.setTranslationX(mBurnInOffsetX);

        mAodFp.setTranslationY(mBurnInOffsetY);