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

Commit 6916ac12 authored by Aaron Liu's avatar Aaron Liu
Browse files

[Bouncer] Reset alpha and translation of view. 

Reset alpha and translation of pin view in modern arch. The alpha and
translation is affected in the disappear animation. We want to reset it.

Bug: 249336718
Test: Manual on device
Change-Id: Id506792fc263c07e9b0fc99dd515fe47daedf5af
parent 4b73f2a5

packages/SystemUI/src/com/android/keyguard/KeyguardPINView.java

+2 −0
Original line number Diff line number Diff line
@@ -176,6 +176,8 @@ public class KeyguardPINView extends KeyguardPinBasedInputView { 


    @Override

    public void startAppearAnimation() {

        setAlpha(1f);

        setTranslationY(0);

        if (mAppearAnimator.isRunning()) {

            mAppearAnimator.cancel();

        }

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainer.java

+2 −2
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ public class KeyguardSecurityContainer extends FrameLayout { 
    }



    /**

     * Runs after a succsssful authentication only

     * Runs after a successful authentication only

     */

    public void startDisappearAnimation(SecurityMode securitySelection) {

        mDisappearAnimRunning = true;
@@ -1063,6 +1063,7 @@ public class KeyguardSecurityContainer extends FrameLayout { 
                mPopup.dismiss();

                mPopup = null;

            }

            setupUserSwitcher();

        }



        @Override
@@ -1096,7 +1097,6 @@ public class KeyguardSecurityContainer extends FrameLayout { 
                return;

            }



            mView.setAlpha(1f);

            mUserSwitcherViewGroup.setAlpha(0f);

            ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(mUserSwitcherViewGroup, View.ALPHA,

                    1f);

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

+1 −0
Original line number Diff line number Diff line
@@ -427,6 +427,7 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 


    public void startAppearAnimation() {

        if (mCurrentSecurityMode != SecurityMode.None) {

            mView.setAlpha(1f);

            mView.startAppearAnimation(mCurrentSecurityMode);

            getCurrentSecurityController().startAppearAnimation();

        }