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

Commit 4d26aa4b authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "WM: Perform layout based on the requested flags" into pi-dev 

am: 10755b8a

Change-Id: I5cffd5adf88067a44adf16c1a60904d1050bd272
parents c747de74 10755b8a

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

+1 −1
Original line number Diff line number Diff line
@@ -5082,7 +5082,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        final int fl = PolicyControl.getWindowFlags(win, attrs);

        final int pfl = attrs.privateFlags;

        final int sim = attrs.softInputMode;

        final int requestedSysUiFl = PolicyControl.getSystemUiVisibility(win, null);

        final int requestedSysUiFl = PolicyControl.getSystemUiVisibility(null, attrs);

        final int sysUiFl = requestedSysUiFl | getImpliedSysUiFlagsForLayout(attrs);



        final Rect pf = mTmpParentFrame;

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

+2 −1
Original line number Diff line number Diff line
@@ -65,7 +65,8 @@ public class PolicyControl { 


    public static int getSystemUiVisibility(WindowState win, LayoutParams attrs) {

        attrs = attrs != null ? attrs : win.getAttrs();

        int vis = win != null ? win.getSystemUiVisibility() : attrs.systemUiVisibility;

        int vis = win != null ? win.getSystemUiVisibility()

                : (attrs.systemUiVisibility | attrs.subtreeSystemUiVisibility);

        if (sImmersiveStatusFilter != null && sImmersiveStatusFilter.matches(attrs)) {

            vis |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY

                    | View.SYSTEM_UI_FLAG_FULLSCREEN