diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-07-28 00:36:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-28 00:36:00 +0000 |
| commit | dcf61a2dfa392fa5994c4ad07869c02929989823 (patch) | |
| tree | fc5ed7db95bc77cbb6110198f965fa77a51b3895 /src/com/android/settings | |
| parent | 596ce9bab73204e9c0cd4a4efbb5602f8c6d0024 (diff) | |
| parent | 35d26096c03fe1419fc1aeea19bf24a821a1c422 (diff) | |
| download | packages_apps_Settings-dcf61a2dfa392fa5994c4ad07869c02929989823.zip packages_apps_Settings-dcf61a2dfa392fa5994c4ad07869c02929989823.tar.gz packages_apps_Settings-dcf61a2dfa392fa5994c4ad07869c02929989823.tar.bz2 | |
Merge "Fix blank confirm device credential activity" into mnc-dev
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java index f56c315..176efbc 100644 --- a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java +++ b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java @@ -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; } } |