Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tiger Huang
2021-02-03 16:28:08 +00:00
committed by Android (Google) Code Review
parent 31b601537b e537165bc1
commit 1028329a14
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/InsetsStateController.java
View File

@@ -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;

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

@@ -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