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

Merge "Perform layout when IME target changes" into rvc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2020-04-16 11:22:03 +00:00
committed by Android (Google) Code Review
parent c2d3878bf7 62ea2cf5c7
commit 0b91a15f3d
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -3425,7 +3425,7 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
mInputMethodTarget = target;
mInputMethodTargetWaitingAnim = targetWaitingAnim;
assignWindowLayers(false /* setLayoutNeeded */);
assignWindowLayers(true /* setLayoutNeeded */);
updateImeParent();
updateImeControlTarget();
}

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

@@ -191,7 +191,6 @@ public class InsetsStateControllerTest extends WindowTestsBase {
// Adding FLAG_NOT_FOCUSABLE makes app above IME.
app.mAttrs.flags |= FLAG_NOT_FOCUSABLE;
mDisplayContent.computeImeTarget(true);
mDisplayContent.setLayoutNeeded();
mDisplayContent.applySurfaceChangesTransaction();
// app won't get visible IME insets while above IME even when IME is visible.
@@ -204,7 +203,6 @@ public class InsetsStateControllerTest extends WindowTestsBase {
// Removing FLAG_NOT_FOCUSABLE makes app below IME.
app.mAttrs.flags &= ~FLAG_NOT_FOCUSABLE;
mDisplayContent.computeImeTarget(true);
mDisplayContent.setLayoutNeeded();
mDisplayContent.applySurfaceChangesTransaction();
// Make sure app got notified.