PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am bcb0011d: am afd5a848: am dcf61a2d: Merge "Fix blank confirm device credential activity" into mnc-dev

Browse Source 
* commit 'bcb0011dd9065f868a7b5e75c8ace4fed49aabb8':
  Fix blank confirm device credential activity
This commit is contained in:
Jorim Jaggi
2015-07-28 01:19:26 +00:00
committed by Android Git Automerger
parent 6b73c0c678 bcb0011dd9
commit 401453eb9f
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/ConfirmDeviceCredentialBaseActivity.java
View File

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