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

Commit bc2a6556 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 4cc40c76 3bc00f22

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);