diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-07-24 13:03:12 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-07-27 18:53:29 +0000 |
| commit | 35d26096c03fe1419fc1aeea19bf24a821a1c422 (patch) | |
| tree | 71e3dfff2a86b1d009e2718ded87a6055905e531 /src/com/android/settings | |
| parent | 3b521b60d3a1921b5231633105d1ca7afadd9978 (diff) | |
| download | packages_apps_Settings-35d26096c03fe1419fc1aeea19bf24a821a1c422.zip packages_apps_Settings-35d26096c03fe1419fc1aeea19bf24a821a1c422.tar.gz packages_apps_Settings-35d26096c03fe1419fc1aeea19bf24a821a1c422.tar.bz2 | |
Fix blank confirm device credential activity
Make sure to play the enter animation only once, so it is guaranteed
that we get onEnterAnimationComplete.
Bug: 22677671
Change-Id: Ia01bb33d6a90abb7dc26c9c12168e2c5ffab1b1d
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; } } |