am ccd5aeef: Workaround for a keyguard problem that appeared in the in call screen.

Merge commit 'ccd5aeef0bccfa7963a3dc5d33d467a1446865f1' into eclair-plus-aosp

* commit 'ccd5aeef0bccfa7963a3dc5d33d467a1446865f1':
  Workaround for a keyguard problem that appeared in the in call screen.
This commit is contained in:
Mike Lockwood
2010-01-21 18:27:50 -08:00
committed by Android Git Automerger

View File

@@ -1450,18 +1450,18 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
} else if (mHideLockScreen) {
if (mKeyguard.hideLw(false)) {
mKeyguardMediator.setHidden(true);
changes |= FINISH_LAYOUT_REDO_LAYOUT
| FINISH_LAYOUT_REDO_CONFIG
| FINISH_LAYOUT_REDO_WALLPAPER;
}
mKeyguardMediator.setHidden(true);
} else {
if (mKeyguard.showLw(false)) {
mKeyguardMediator.setHidden(false);
changes |= FINISH_LAYOUT_REDO_LAYOUT
| FINISH_LAYOUT_REDO_CONFIG
| FINISH_LAYOUT_REDO_WALLPAPER;
}
mKeyguardMediator.setHidden(false);
}
}