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

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

Browse Source 
* commit 'dcf61a2dfa392fa5994c4ad07869c02929989823':
  Fix blank confirm device credential activity
This commit is contained in:
Jorim Jaggi
2015-07-28 00:50:44 +00:00
committed by Android Git Automerger
parent 34877c4077 dcf61a2dfa
commit afd5a84830
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 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;
}
}