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

Commit 24d08ef6 authored by Yunfan Chen's avatar Yunfan Chen
Browse files

Clean-up usage of the old system UI flags in DisplayPolicy 

This patch removed unnecessary code for the old insets mode and also
replaced the system UI flags, requested system UI flags, layout flags
with the new insets APIs.

This patch doesn't change any functionality of the system. Everything
should work as before.

Bug: 155413635
Test: go/wm-smoke
Test: atest DisplayPolicyInsetsTests
Test: atest DisplayPolicyLayoutTests
Test: atest DisplayPolicyTests
Change-Id: I0bf893dd85b3cd8282919864bbe52a94be47d6bb
parent 1a1eccf5

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

+78 −524

File changed.

Preview size limit exceeded, changes collapsed.

services/tests/wmtests/src/com/android/server/wm/DisplayPolicyLayoutTests.java

+2 −7
Original line number Diff line number Diff line
@@ -26,8 +26,6 @@ import static android.view.InsetsState.ITYPE_TOP_GESTURES; 
import static android.view.Surface.ROTATION_0;

import static android.view.Surface.ROTATION_270;

import static android.view.Surface.ROTATION_90;

import static android.view.View.SYSTEM_UI_FLAG_FULLSCREEN;

import static android.view.View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;

import static android.view.ViewGroup.LayoutParams.MATCH_PARENT;

import static android.view.WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;

import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_INSET_DECOR;
@@ -475,7 +473,6 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { 
        mWindow.mAttrs.flags =

                FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;

        mWindow.mAttrs.setFitInsetsTypes(0 /* types */);

        mWindow.mAttrs.subtreeSystemUiVisibility |= SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;

        mWindow.mAttrs.setFitInsetsTypes(

                mWindow.mAttrs.getFitInsetsTypes() & ~Type.statusBars());

        addWindow(mWindow);
@@ -497,9 +494,9 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { 
        mWindow.mAttrs.flags =

                FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;

        mWindow.mAttrs.setFitInsetsTypes(0 /* types */);

        mWindow.mAttrs.subtreeSystemUiVisibility |= SYSTEM_UI_FLAG_FULLSCREEN;

        mDisplayContent.getInsetsPolicy().getInsetsForDispatch(mWindow)

                .getSource(InsetsState.ITYPE_STATUS_BAR).setVisible(false);

        mWindow.getRequestedInsetsState().getSource(ITYPE_STATUS_BAR).setVisible(false);

        addWindow(mWindow);



        mDisplayPolicy.beginLayoutLw(mFrames, 0 /* UI mode */);
@@ -519,9 +516,9 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { 
        mWindow.mAttrs.flags =

                FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;

        mWindow.mAttrs.setFitInsetsTypes(0 /* types */);

        mWindow.mAttrs.subtreeSystemUiVisibility |= SYSTEM_UI_FLAG_FULLSCREEN;

        mDisplayContent.getInsetsPolicy().getInsetsForDispatch(mWindow)

                .getSource(InsetsState.ITYPE_STATUS_BAR).setVisible(false);

        mWindow.getRequestedInsetsState().getSource(ITYPE_STATUS_BAR).setVisible(false);

        mWindow.mAttrs.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

        addWindow(mWindow);
@@ -585,7 +582,6 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { 
        mWindow.mAttrs.flags =

                FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;

        mWindow.mAttrs.setFitInsetsTypes(0 /* types */);

        mWindow.mAttrs.subtreeSystemUiVisibility |= SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;

        mWindow.mAttrs.setFitInsetsTypes(

                mWindow.mAttrs.getFitInsetsTypes() & ~Type.statusBars());

        addWindow(mWindow);
@@ -626,7 +622,6 @@ public class DisplayPolicyLayoutTests extends DisplayPolicyTestsBase { 
        mWindow.mAttrs.flags =

                FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR | FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS;

        mWindow.mAttrs.setFitInsetsTypes(0 /* types */);

        mWindow.mAttrs.subtreeSystemUiVisibility |= SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN;

        mWindow.mAttrs.setFitInsetsTypes(

                mWindow.mAttrs.getFitInsetsTypes() & ~Type.statusBars());

        mWindow.mAttrs.layoutInDisplayCutoutMode = LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;