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

Merge "Fix IME not shown from recents to split-screen task" into tm-qpr-dev

Browse Source
This commit is contained in:
Jerry Chang
2023-01-05 04:21:08 +00:00
committed by Android (Google) Code Review
parent ce8089989a 49fb27a6b4
commit e8cf22be3d
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
libs/WindowManager/Shell/src/com/android/wm/shell/common/DisplayImeController.java
View File

@@ -274,29 +274,30 @@ public class DisplayImeController implements DisplayController.OnDisplaysChanged
} }
if (hasImeSourceControl) { if (hasImeSourceControl) {
final Point lastSurfacePosition = mImeSourceControl != null
? mImeSourceControl.getSurfacePosition() : null;
final boolean positionChanged =
!imeSourceControl.getSurfacePosition().equals(lastSurfacePosition);
final boolean leashChanged =
!haveSameLeash(mImeSourceControl, imeSourceControl);
if (mAnimation != null) { if (mAnimation != null) {
final Point lastSurfacePosition = hadImeSourceControl
? mImeSourceControl.getSurfacePosition() : null;
final boolean positionChanged =
!imeSourceControl.getSurfacePosition().equals(lastSurfacePosition);
if (positionChanged) { if (positionChanged) {
startAnimation(mImeShowing, true /* forceRestart */); startAnimation(mImeShowing, true /* forceRestart */);
} }
} else { } else {
if (leashChanged) { if (!haveSameLeash(mImeSourceControl, imeSourceControl)) {
applyVisibilityToLeash(imeSourceControl); applyVisibilityToLeash(imeSourceControl);
} }
if (!mImeShowing) { if (!mImeShowing) {
removeImeSurface(); removeImeSurface();
} }
if (mImeSourceControl != null) {
mImeSourceControl.release(SurfaceControl::release);
}
} }
mImeSourceControl = imeSourceControl; } else if (mAnimation != null) {
mAnimation.cancel();
} }
if (hadImeSourceControl && mImeSourceControl != imeSourceControl) {
mImeSourceControl.release(SurfaceControl::release);
}
mImeSourceControl = imeSourceControl;
} }
private void applyVisibilityToLeash(InsetsSourceControl imeSourceControl) { private void applyVisibilityToLeash(InsetsSourceControl imeSourceControl) {

11
libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/common/DisplayImeControllerTest.java
View File

@@ -22,6 +22,8 @@ import static android.view.Surface.ROTATION_0;
import static android.view.WindowInsets.Type.ime; import static android.view.WindowInsets.Type.ime;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
@@ -131,6 +133,15 @@ public class DisplayImeControllerTest extends ShellTestCase {
verify(mT).show(any()); verify(mT).show(any());
} }
@Test
public void insetsControlChanged_updateImeSourceControl() {
mPerDisplay.insetsControlChanged(insetsStateWithIme(false), insetsSourceControl());
assertNotNull(mPerDisplay.mImeSourceControl);
mPerDisplay.insetsControlChanged(new InsetsState(), new InsetsSourceControl[]{});
assertNull(mPerDisplay.mImeSourceControl);
}
private InsetsSourceControl[] insetsSourceControl() { private InsetsSourceControl[] insetsSourceControl() {
return new InsetsSourceControl[]{ return new InsetsSourceControl[]{
new InsetsSourceControl( new InsetsSourceControl(