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

Commit bc77f1ae authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

DO NOT MERGE Only set the LAYOUT flags if the window is fullscreen am: 5c31a5c1 

Change-Id: I984729eaf20a53d3d2a4eb1c4457141140600964
parents a2390390 5c31a5c1

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

+7 −3
Original line number Diff line number Diff line
@@ -67,15 +67,19 @@ class PolicyControl { 
                : (attrs.systemUiVisibility | attrs.subtreeSystemUiVisibility);

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

            vis |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY

                    | View.SYSTEM_UI_FLAG_FULLSCREEN

                    | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;

                    | View.SYSTEM_UI_FLAG_FULLSCREEN;

            if (attrs.isFullscreen()) {

                vis |= View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;

            }

            vis &= ~(View.SYSTEM_UI_FLAG_LAYOUT_STABLE

                    | View.STATUS_BAR_TRANSLUCENT);

        }

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

            vis |= View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY

                    | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION

                    | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION;

            if (attrs.isFullscreen()) {

                vis |= View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION;

            }

            vis &= ~(View.SYSTEM_UI_FLAG_LAYOUT_STABLE

                    | View.NAVIGATION_BAR_TRANSLUCENT);

        }