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

am: 9f706c0e25 Change-Id: Id7fcb606f5812de42b86699fdcc4a89e1918ff69
2017-05-08 22:42:36 +00:00
parent 83249b0197 9f706c0e25
commit d4dcb0e069
1 changed files with 2 additions and 1 deletions
--- a/services/core/java/com/android/server/policy/PhoneWindowManager.java
+++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java
@@ -5485,7 +5485,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                // Maintain fullscreen layout until incoming animation is complete.
                topIsFullscreen = mTopIsFullscreen && mStatusBar.isAnimatingLw();
                // Transient status bar on the lockscreen is not allowed
-                if (mForceStatusBarFromKeyguard && mStatusBarController.isTransientShowing()) {
+                if ((mForceStatusBarFromKeyguard || statusBarExpanded)
+                        && mStatusBarController.isTransientShowing()) {
                    mStatusBarController.updateVisibilityLw(false /*transientAllowed*/,
                            mLastSystemUiFlags, mLastSystemUiFlags);
                }