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

Commit e7503ef8 authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge "[Bouncer] Reset alpha and translation of view." into tm-qpr-dev

parents 22ae4477 6916ac12

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

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




    @Override

    @Override

    public void startAppearAnimation() {

    public void startAppearAnimation() {

        setAlpha(1f);

        setTranslationY(0);

        if (mAppearAnimator.isRunning()) {

        if (mAppearAnimator.isRunning()) {

            mAppearAnimator.cancel();

            mAppearAnimator.cancel();

        }

        }

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

+2 −2
Original line number Original line 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) {

    public void startDisappearAnimation(SecurityMode securitySelection) {

        mDisappearAnimRunning = true;

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

                mPopup.dismiss();

                mPopup = null;

                mPopup = null;

            }

            }

            setupUserSwitcher();

        }

        }





        @Override

        @Override
@@ -1101,7 +1102,6 @@ public class KeyguardSecurityContainer extends FrameLayout { 
                return;

                return;

            }

            }





            mView.setAlpha(1f);

            mUserSwitcherViewGroup.setAlpha(0f);

            mUserSwitcherViewGroup.setAlpha(0f);

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

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

                    1f);

                    1f);

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

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




    public void startAppearAnimation() {

    public void startAppearAnimation() {

        if (mCurrentSecurityMode != SecurityMode.None) {

        if (mCurrentSecurityMode != SecurityMode.None) {

            mView.setAlpha(1f);

            mView.startAppearAnimation(mCurrentSecurityMode);

            mView.startAppearAnimation(mCurrentSecurityMode);

            getCurrentSecurityController().startAppearAnimation();

            getCurrentSecurityController().startAppearAnimation();

        }

        }