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

Merge "Don't set relative z of window to IME if starting window" into rvc-dev am: e1da24b5df am: ed02b740c1

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852826

Change-Id: I5e1ac2335ce0d193679092608f679722e146b36a
This commit is contained in:
TreeHugger Robot
2020-06-16 06:22:28 +00:00
committed by Automerger Merge Worker
parent 9d40364e06 ed02b740c1
commit 004836828a
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -5426,6 +5426,7 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP
final WindowState imeTarget = getDisplayContent().mInputMethodTarget; final WindowState imeTarget = getDisplayContent().mInputMethodTarget;
boolean inTokenWithAndAboveImeTarget = imeTarget != null && imeTarget != this boolean inTokenWithAndAboveImeTarget = imeTarget != null && imeTarget != this
&& imeTarget.mToken == mToken && imeTarget.mToken == mToken
&& mAttrs.type != TYPE_APPLICATION_STARTING
&& getParent() != null && getParent() != null
&& imeTarget.compareTo(this) <= 0; && imeTarget.compareTo(this) <= 0;
return inTokenWithAndAboveImeTarget; return inTokenWithAndAboveImeTarget;

10
services/tests/wmtests/src/com/android/server/wm/WindowStateTests.java
View File

@@ -692,4 +692,14 @@ public class WindowStateTests extends WindowTestsBase {
sameTokenWindow.removeImmediately(); sameTokenWindow.removeImmediately();
assertFalse(sameTokenWindow.needsRelativeLayeringToIme()); assertFalse(sameTokenWindow.needsRelativeLayeringToIme());
} }
@Test
public void testNeedsRelativeLayeringToIme_startingWindow() {
WindowState sameTokenWindow = createWindow(null, TYPE_APPLICATION_STARTING,
mAppWindow.mToken, "SameTokenWindow");
mDisplayContent.mInputMethodTarget = mAppWindow;
sameTokenWindow.mActivityRecord.getStack().setWindowingMode(
WINDOWING_MODE_SPLIT_SCREEN_PRIMARY);
assertFalse(sameTokenWindow.needsRelativeLayeringToIme());
}
} }