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

Merge "Exit transient mode as soon as status bar window is fullscreen" into oc-dev

Browse Source 
am: f93dc8b650

Change-Id: Ib0981ecbcaa461f7f5eef8133fd26155c6db304d
This commit is contained in:
Jorim Jaggi
2017-05-08 22:08:57 +00:00
committed by android-build-merger
parent b23f284ebb f93dc8b650
commit 9f706c0e25
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -5485,7 +5485,8 @@ 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 // Transient status bar on the lockscreen is not allowed
if (mForceStatusBarFromKeyguard && mStatusBarController.isTransientShowing()) { if ((mForceStatusBarFromKeyguard || statusBarExpanded)
&& mStatusBarController.isTransientShowing()) {
mStatusBarController.updateVisibilityLw(false /*transientAllowed*/, mStatusBarController.updateVisibilityLw(false /*transientAllowed*/,
mLastSystemUiFlags, mLastSystemUiFlags); mLastSystemUiFlags, mLastSystemUiFlags);
} }