Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix 2679658: Be more aggressive about recreating lock screen."

Browse Source
This commit is contained in:
Jim Miller
2011-09-06 23:16:13 -07:00
committed by Android (Google) Code Review
parent 3791dc9b1c 62c3efd204
commit b4a431fa16
1 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
policy/src/com/android/internal/policy/impl/LockPatternKeyguardView.java
View File

@@ -180,7 +180,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
private Runnable mRecreateRunnable = new Runnable() { private Runnable mRecreateRunnable = new Runnable() {
public void run() { public void run() {
updateScreen(mMode, false); updateScreen(mMode, true);
} }
}; };
@@ -400,7 +400,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
// then finish and get out // then finish and get out
if (mEnableFallback || mAccountIndex >= mAccounts.length) { if (mEnableFallback || mAccountIndex >= mAccounts.length) {
if (mUnlockScreen == null) { if (mUnlockScreen == null) {
Log.w(TAG, "no unlock screen when trying to enable fallback"); if (DEBUG) Log.w(TAG, "no unlock screen when trying to enable fallback");
} else if (mUnlockScreen instanceof PatternUnlockScreen) { } else if (mUnlockScreen instanceof PatternUnlockScreen) {
((PatternUnlockScreen)mUnlockScreen).setEnableFallback(mEnableFallback); ((PatternUnlockScreen)mUnlockScreen).setEnableFallback(mEnableFallback);
} }
@@ -459,7 +459,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
public void reset() { public void reset() {
mIsVerifyUnlockOnly = false; mIsVerifyUnlockOnly = false;
mForgotPattern = false; mForgotPattern = false;
updateScreen(getInitialMode(), false); post(mRecreateRunnable);
} }
@Override @Override
@@ -485,9 +485,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
private void recreateLockScreen() { private void recreateLockScreen() {
if (mLockScreen != null) { if (mLockScreen != null) {
if (mLockScreen.getVisibility() == View.VISIBLE) { ((KeyguardScreen) mLockScreen).onPause();
((KeyguardScreen) mLockScreen).onPause();
}
((KeyguardScreen) mLockScreen).cleanUp(); ((KeyguardScreen) mLockScreen).cleanUp();
removeView(mLockScreen); removeView(mLockScreen);
} }
@@ -499,9 +497,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
private void recreateUnlockScreen(UnlockMode unlockMode) { private void recreateUnlockScreen(UnlockMode unlockMode) {
if (mUnlockScreen != null) { if (mUnlockScreen != null) {
if (mUnlockScreen.getVisibility() == View.VISIBLE) { ((KeyguardScreen) mUnlockScreen).onPause();
((KeyguardScreen) mUnlockScreen).onPause();
}
((KeyguardScreen) mUnlockScreen).cleanUp(); ((KeyguardScreen) mUnlockScreen).cleanUp();
removeView(mUnlockScreen); removeView(mUnlockScreen);
} }
@@ -611,7 +607,7 @@ public class LockPatternKeyguardView extends KeyguardViewBase {
private void updateScreen(Mode mode, boolean force) { private void updateScreen(Mode mode, boolean force) {
if (DEBUG_CONFIGURATION) Log.v(TAG, "**** UPDATE SCREEN: mode=" + mode if (DEBUG_CONFIGURATION) Log.v(TAG, "**** UPDATE SCREEN: mode=" + mode
+ " last mode=" + mMode, new RuntimeException()); + " last mode=" + mMode + ", force = " + force, new RuntimeException());
mMode = mode; mMode = mode;