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

Merge "Fix crash in ConfirmDeviceCredentials" into nyc-dev

Browse Source
This commit is contained in:
Jim Miller
2016-04-01 22:14:44 +00:00
committed by Android (Google) Code Review
parent e652b7b0ca d12166e411
commit 4a92815acd
1 changed files with 0 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,6 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
private boolean mDark; private boolean mDark;
private boolean mEnterAnimationPending; private boolean mEnterAnimationPending;
private boolean mFirstTimeVisible = true; private boolean mFirstTimeVisible = true;
private final Handler mHandler = new Handler();
@Override @Override
protected void onCreate(Bundle savedState) { protected void onCreate(Bundle savedState) {
@@ -76,7 +75,6 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
mFirstTimeVisible = false; mFirstTimeVisible = false;
prepareEnterAnimation(); prepareEnterAnimation();
mEnterAnimationPending = true; mEnterAnimationPending = true;
mHandler.postDelayed(mEnterAnimationCompleteTimeoutRunnable, 1000);
} }
} }
@@ -92,7 +90,6 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
public void onEnterAnimationComplete() { public void onEnterAnimationComplete() {
super.onEnterAnimationComplete(); super.onEnterAnimationComplete();
if (mEnterAnimationPending) { if (mEnterAnimationPending) {
mHandler.removeCallbacks(mEnterAnimationCompleteTimeoutRunnable);
startEnterAnimation(); startEnterAnimation();
mEnterAnimationPending = false; mEnterAnimationPending = false;
} }
@@ -105,15 +102,4 @@ public abstract class ConfirmDeviceCredentialBaseActivity extends SettingsActivi
public void startEnterAnimation() { public void startEnterAnimation() {
getFragment().startEnterAnimation(); getFragment().startEnterAnimation();
} }
/**
* Workaround for a bug in window manager which results that onEnterAnimationComplete doesn't
* get called in all cases.
*/
private final Runnable mEnterAnimationCompleteTimeoutRunnable = new Runnable() {
@Override
public void run() {
onEnterAnimationComplete();
}
};
} }