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

Commit 1028329a authored by Tiger Huang's avatar Tiger Huang Committed by Android (Google) Code Review
Browse files

Merge "Don't provide IME insets to the PIP window" into sc-dev

parents 31b60153 e537165b

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

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.server.wm;



import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW;

import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;

import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;

import static android.os.Trace.TRACE_TAG_WINDOW_MANAGER;

import static android.view.InsetsState.ITYPE_CAPTION_BAR;
@@ -218,6 +219,9 @@ class InsetsStateController { 
            state.removeSource(ITYPE_STATUS_BAR);

            state.removeSource(ITYPE_NAVIGATION_BAR);

            state.removeSource(ITYPE_EXTRA_NAVIGATION_BAR);

            if (windowingMode == WINDOWING_MODE_PINNED) {

                state.removeSource(ITYPE_IME);

            }

        }



        return state;

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

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ public class InsetsStateControllerTest extends WindowTestsBase { 


        assertNull(getController().getInsetsForWindow(app).peekSource(ITYPE_STATUS_BAR));

        assertNull(getController().getInsetsForWindow(app).peekSource(ITYPE_NAVIGATION_BAR));

        assertNull(getController().getInsetsForWindow(app).peekSource(ITYPE_IME));

    }



    @Test