commit dcf61a2dfa392fa5994c4ad07869c02929989823
author Jorim Jaggi <jjaggi@google.com> Tue Jul 28 00:36:00 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 28 00:36:00 2015 +0000
tree fc5ed7db95bc77cbb6110198f965fa77a51b3895
parent 596ce9bab73204e9c0cd4a4efbb5602f8c6d0024
parent 35d26096c03fe1419fc1aeea19bf24a821a1c422

Merge "Fix blank confirm device credential activity" into mnc-dev

src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java

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 @@
     private boolean mRestoring;
     private boolean mDark;
     private boolean mEnterAnimationPending;
+    private boolean mFirstTimeVisible = true;
 
     @Override
     protected void onCreate(Bundle savedState) {
@@ -62,7 +63,8 @@
     @Override
     public void onResume() {
         super.onResume();
-        if (!isChangingConfigurations() && !mRestoring && mDark) {
+        if (!isChangingConfigurations() && !mRestoring && mDark && mFirstTimeVisible) {
+            mFirstTimeVisible = false;
             prepareEnterAnimation();
             mEnterAnimationPending = true;
         }
@@ -81,6 +83,7 @@
         super.onEnterAnimationComplete();
         if (mEnterAnimationPending) {
             startEnterAnimation();
+            mEnterAnimationPending = false;
         }
     }