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

Commit 5a4573fa authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "ScreenDecor Windows: shouldn't receive inset hints"

parents 98da482e f8898abc

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

+7 −2
Original line number Diff line number Diff line
@@ -4352,6 +4352,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            DisplayFrames displayFrames, Rect outContentInsets, Rect outStableInsets,

            Rect outOutsets, DisplayCutout.ParcelableWrapper outDisplayCutout) {

        final int fl = PolicyControl.getWindowFlags(null, attrs);

        final int pfl = attrs.privateFlags;

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

        final int systemUiVisibility = (sysuiVis | attrs.subtreeSystemUiVisibility);

        final int displayRotation = displayFrames.mRotation;
@@ -4374,8 +4375,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            }

        }



        if ((fl & (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR))

                == (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR)) {

        final boolean layoutInScreenAndInsetDecor =

                (fl & (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR))

                        == (FLAG_LAYOUT_IN_SCREEN | FLAG_LAYOUT_INSET_DECOR);

        final boolean screenDecor = (pfl & PRIVATE_FLAG_IS_SCREEN_DECOR) != 0;



        if (layoutInScreenAndInsetDecor && !screenDecor) {

            Rect frame;

            int availRight, availBottom;

            if (canHideNavigationBar() &&

services/tests/servicestests/src/com/android/server/policy/PhoneWindowManagerLayoutTest.java

+24 −0
Original line number Diff line number Diff line
@@ -27,14 +27,19 @@ import static android.view.WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN; 
import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;

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

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

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

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



import static org.hamcrest.Matchers.equalTo;

import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertThat;



import android.graphics.PixelFormat;

import android.graphics.Rect;

import android.platform.test.annotations.Presubmit;

import android.support.test.filters.SmallTest;

import android.support.test.runner.AndroidJUnit4;

import android.view.DisplayCutout;

import android.view.WindowManager;



import org.junit.Before;
@@ -262,4 +267,23 @@ public class PhoneWindowManagerLayoutTest extends PhoneWindowManagerTestBase { 
        assertInsetBy(mAppWindow.decorFrame, 0, 0, 0, 0);

    }



    @Test

    public void insetHint_screenDecorWindow() {

        addDisplayCutout();

        mAppWindow.attrs.privateFlags |= PRIVATE_FLAG_IS_SCREEN_DECOR;



        mPolicy.beginLayoutLw(mFrames, 0 /* UI mode */);



        final Rect content = new Rect();

        final Rect stable = new Rect();

        final Rect outsets = new Rect();

        final DisplayCutout.ParcelableWrapper cutout = new DisplayCutout.ParcelableWrapper();

        mPolicy.getInsetHintLw(mAppWindow.attrs, null /* taskBounds */, mFrames, content,

                stable, outsets, cutout);



        assertThat(content, equalTo(new Rect()));

        assertThat(stable, equalTo(new Rect()));

        assertThat(outsets, equalTo(new Rect()));

        assertThat(cutout.get(), equalTo(DisplayCutout.NO_CUTOUT));

    }

}
 
 No newline at end of file