Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 29583132 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I7ff9d493a3cd74eac667ff2d7dbbf10fec2f56cb
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents eca9a2fd bc2a6556

services/core/java/com/android/server/wm/InsetsPolicy.java

+1 −2
Original line number Diff line number Diff line
@@ -454,8 +454,7 @@ class InsetsPolicy { 
            final InsetsSource originalImeSource = originalState.peekSource(ITYPE_IME);



            if (originalImeSource != null) {

                final boolean imeVisibility =

                        w.mActivityRecord.mLastImeShown || w.getRequestedVisibility(ITYPE_IME);

                final boolean imeVisibility = w.getRequestedVisibility(ITYPE_IME);

                final InsetsState state = copyState ? new InsetsState(originalState)

                        : originalState;

                final InsetsSource imeSource = new InsetsSource(originalImeSource);

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

+6 −0
Original line number Diff line number Diff line
@@ -1032,6 +1032,9 @@ public class WindowStateTests extends WindowTestsBase { 
        // Simulate app requests IME with updating all windows Insets State when IME is above app.

        mDisplayContent.setImeLayeringTarget(app);

        mDisplayContent.setImeInputTarget(app);

        final InsetsVisibilities requestedVisibilities = new InsetsVisibilities();

        requestedVisibilities.setVisibility(ITYPE_IME, true);

        app.setRequestedVisibilities(requestedVisibilities);

        assertTrue(mDisplayContent.shouldImeAttachedToApp());

        controller.getImeSourceProvider().scheduleShowImePostLayout(app);

        controller.getImeSourceProvider().getSource().setVisible(true);
@@ -1069,6 +1072,9 @@ public class WindowStateTests extends WindowTestsBase { 
        app2.mActivityRecord.mImeInsetsFrozenUntilStartInput = true;

        mDisplayContent.setImeLayeringTarget(app);

        mDisplayContent.setImeInputTarget(app);

        final InsetsVisibilities requestedVisibilities = new InsetsVisibilities();

        requestedVisibilities.setVisibility(ITYPE_IME, true);

        app.setRequestedVisibilities(requestedVisibilities);

        assertTrue(mDisplayContent.shouldImeAttachedToApp());

        controller.getImeSourceProvider().scheduleShowImePostLayout(app);

        controller.getImeSourceProvider().getSource().setVisible(true);