am 66e93076: Merge "Disable security view transitions in keyguard" into jb-mr1-dev (1ea95455) · Commits · e / os / android_frameworks_base

policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java

+14 −13

Original line number	Diff line number	Diff line
		@@ -608,7 +608,7 @@ public class KeyguardHostView extends KeyguardViewBase {
		* @param securityMode
		*/
		private void showSecurityScreen(SecurityMode securityMode) {
		if (DEBUG) Log.d(TAG, "showSecurityScreen");
		if (DEBUG) Log.d(TAG, "showSecurityScreen(" + securityMode + ")");

		if (securityMode == mCurrentSecuritySelection) return;

		@@ -628,10 +628,12 @@ public class KeyguardHostView extends KeyguardViewBase {
		final int childCount = mSecurityViewContainer.getChildCount();

		// Do flip animation to the next screen
		if (false) {
		mSecurityViewContainer.setInAnimation(
		AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_animate_in));
		mSecurityViewContainer.setOutAnimation(
		AnimationUtils.loadAnimation(mContext, R.anim.keyguard_security_animate_out));
		}
		final int securityViewIdForMode = getSecurityViewIdForMode(securityMode);
		for (int i = 0; i < childCount; i++) {
		if (mSecurityViewContainer.getChildAt(i).getId() == securityViewIdForMode) {
		@@ -640,7 +642,6 @@ public class KeyguardHostView extends KeyguardViewBase {
		}
		}


		if (securityMode == SecurityMode.None) {
		// Discard current runnable if we're switching back to the selector view
		setOnDismissRunnable(null);