am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev (afd5a848) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -27,6 +27,7 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
		private boolean mRestoring;
		private boolean mDark;
		private boolean mEnterAnimationPending;
		private boolean mFirstTimeVisible = true;

		@Override
		protected void onCreate(Bundle savedState) {
		@@ -62,7 +63,8 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
		@Override
		public void onResume() {
		super.onResume();
		if (!isChangingConfigurations() && !mRestoring && mDark) {
		if (!isChangingConfigurations() && !mRestoring && mDark && mFirstTimeVisible) {
		mFirstTimeVisible = false;
		prepareEnterAnimation();
		mEnterAnimationPending = true;
		}
		@@ -81,6 +83,7 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
		super.onEnterAnimationComplete();
		if (mEnterAnimationPending) {
		startEnterAnimation();
		mEnterAnimationPending = false;
		}
		}