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

am 778eaf4b: Merge "Disallow transient status bar on the keyguard." into klp-dev

Browse Source 
* commit '778eaf4bece18d08e91df1d405337a18c3abcd57':
  Disallow transient status bar on the keyguard.
This commit is contained in:
John Spurlock
2013-11-11 18:01:12 -08:00
committed by Android Git Automerger
parent 57a81a7839 778eaf4bec
commit da721a99fe
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -3468,6 +3468,11 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
// Maintain fullscreen layout until incoming animation is complete. // Maintain fullscreen layout until incoming animation is complete.
topIsFullscreen = mTopIsFullscreen && mStatusBar.isAnimatingLw(); topIsFullscreen = mTopIsFullscreen && mStatusBar.isAnimatingLw();
// Transient status bar on the lockscreen is not allowed
if (mForceStatusBarFromKeyguard && mStatusBarController.isTransientShowing()) {
mStatusBarController.updateVisibilityLw(false /*transientAllowed*/,
mLastSystemUiFlags, mLastSystemUiFlags);
}
} else if (mTopFullscreenOpaqueWindowState != null) { } else if (mTopFullscreenOpaqueWindowState != null) {
if (localLOGV) { if (localLOGV) {
Slog.d(TAG, "frame: " + mTopFullscreenOpaqueWindowState.getFrameLw() Slog.d(TAG, "frame: " + mTopFullscreenOpaqueWindowState.getFrameLw()