From 35d26096c03fe1419fc1aeea19bf24a821a1c422 Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Fri, 24 Jul 2015 13:03:12 -0700
Subject: [PATCH] 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
---
 .../settings/ConfirmDeviceCredentialBaseActivity.java        | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java b/src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
index f56c3151182..176efbc6a48 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;
         }
     }