Merge "Reset view flipper alpha to 1." into tm-qpr-dev (c9ef5a90) · Commits · e / os / android_frameworks_base

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

+9 −8

Original line number	Diff line number	Diff line
		@@ -235,14 +235,6 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
		}
		updateChildren(0 /* translationY /, 1f / alpha */);
		}

		private void updateChildren(int translationY, float alpha) {
		for (int i = 0; i < KeyguardSecurityContainer.this.getChildCount(); ++i) {
		View child = KeyguardSecurityContainer.this.getChildAt(i);
		child.setTranslationY(translationY);
		child.setAlpha(alpha);
		}
		}
		};

		private final OnBackAnimationCallback mBackCallback = new OnBackAnimationCallback() {
		@@ -594,6 +586,7 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
		* This will run when the bouncer shows in all cases except when the user drags the bouncer up.
		*/
		public void startAppearAnimation(SecurityMode securityMode) {
		updateChildren(0 /* translationY /, 1f / alpha */);
		mViewMode.startAppearAnimation(securityMode);
		}

		@@ -777,6 +770,14 @@ public class KeyguardSecurityContainer extends ConstraintLayout {
		setScaleY(scale);
		}

		private void updateChildren(int translationY, float alpha) {
		for (int i = 0; i < getChildCount(); ++i) {
		View child = getChildAt(i);
		child.setTranslationY(translationY);
		child.setAlpha(alpha);
		}
		}

		/**
		* Enscapsulates the differences between bouncer modes for the container.
		*/