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

Merge "Fix launcher animates keyboard by wrong insets visible value" into tm-qpr-dev am: bc2a65562e

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

Change-Id: I7ff9d493a3cd74eac667ff2d7dbbf10fec2f56cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-01-04 18:30:46 +00:00
committed by Automerger Merge Worker
parent eca9a2fdde bc2a65562e
commit 29583132c9
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/core/java/com/android/server/wm/InsetsPolicy.java
View File

@@ -454,8 +454,7 @@ class InsetsPolicy {
final InsetsSource originalImeSource = originalState.peekSource(ITYPE_IME); final InsetsSource originalImeSource = originalState.peekSource(ITYPE_IME);
if (originalImeSource != null) { if (originalImeSource != null) {
final boolean imeVisibility = final boolean imeVisibility = w.getRequestedVisibility(ITYPE_IME);
w.mActivityRecord.mLastImeShown || w.getRequestedVisibility(ITYPE_IME);
final InsetsState state = copyState ? new InsetsState(originalState) final InsetsState state = copyState ? new InsetsState(originalState)
: originalState; : originalState;
final InsetsSource imeSource = new InsetsSource(originalImeSource); final InsetsSource imeSource = new InsetsSource(originalImeSource);

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

@@ -1032,6 +1032,9 @@ public class WindowStateTests extends WindowTestsBase {
// Simulate app requests IME with updating all windows Insets State when IME is above app. // Simulate app requests IME with updating all windows Insets State when IME is above app.
mDisplayContent.setImeLayeringTarget(app); mDisplayContent.setImeLayeringTarget(app);
mDisplayContent.setImeInputTarget(app); mDisplayContent.setImeInputTarget(app);
final InsetsVisibilities requestedVisibilities = new InsetsVisibilities();
requestedVisibilities.setVisibility(ITYPE_IME, true);
app.setRequestedVisibilities(requestedVisibilities);
assertTrue(mDisplayContent.shouldImeAttachedToApp()); assertTrue(mDisplayContent.shouldImeAttachedToApp());
controller.getImeSourceProvider().scheduleShowImePostLayout(app); controller.getImeSourceProvider().scheduleShowImePostLayout(app);
controller.getImeSourceProvider().getSource().setVisible(true); controller.getImeSourceProvider().getSource().setVisible(true);
@@ -1069,6 +1072,9 @@ public class WindowStateTests extends WindowTestsBase {
app2.mActivityRecord.mImeInsetsFrozenUntilStartInput = true; app2.mActivityRecord.mImeInsetsFrozenUntilStartInput = true;
mDisplayContent.setImeLayeringTarget(app); mDisplayContent.setImeLayeringTarget(app);
mDisplayContent.setImeInputTarget(app); mDisplayContent.setImeInputTarget(app);
final InsetsVisibilities requestedVisibilities = new InsetsVisibilities();
requestedVisibilities.setVisibility(ITYPE_IME, true);
app.setRequestedVisibilities(requestedVisibilities);
assertTrue(mDisplayContent.shouldImeAttachedToApp()); assertTrue(mDisplayContent.shouldImeAttachedToApp());
controller.getImeSourceProvider().scheduleShowImePostLayout(app); controller.getImeSourceProvider().scheduleShowImePostLayout(app);
controller.getImeSourceProvider().getSource().setVisible(true); controller.getImeSourceProvider().getSource().setVisible(true);