Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d4dcb0e0 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

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

am: 9f706c0e

Change-Id: Id7fcb606f5812de42b86699fdcc4a89e1918ff69
parents 83249b01 9f706c0e

services/core/java/com/android/server/policy/PhoneWindowManager.java

+2 −1
Original line number Diff line number Diff line
@@ -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);

                }