Merge "[Bouncer] Reset alpha and translation of view." into tm-qpr-dev (e7503ef8) · Commits · e / os / android_frameworks_base

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();
		}

+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
		@@ -1101,7 +1102,6 @@ public class KeyguardSecurityContainer extends FrameLayout {
		return;
		}

		mView.setAlpha(1f);
		mUserSwitcherViewGroup.setAlpha(0f);
		ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(mUserSwitcherViewGroup, View.ALPHA,
		1f);

+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();
		}