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

Commit 2d258767 authored by Felix Stern's avatar Felix Stern Committed by Android (Google) Code Review
Browse files

Merge "Cancel startAnimation(show=true) if IME is not requested to be visible" into main

parents f3c2f400 32b30fc4

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

+6 −0
Original line number Diff line number Diff line
@@ -468,6 +468,12 @@ public class DisplayImeController implements DisplayController.OnDisplaysChanged 
                if (mImeSourceControl == null || mImeSourceControl.getLeash() == null) {

                    if (DEBUG) Slog.d(TAG, "No leash available, not starting the animation.");

                    return;

                } else if (!mImeRequestedVisible && show) {

                    // we have a control with leash, but the IME was not requested visible before,

                    // therefore aborting the show animation.

                    Slog.e(TAG, "IME was not requested visible, not starting the show animation.");

                    // TODO(b/353463205) fail statsToken here

                    return;

                }

            }

            final InsetsSource imeSource = mInsetsState.peekSource(InsetsSource.ID_IME);

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

+1 −1
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ public class DisplayImeControllerTest extends ShellTestCase { 
    @Test

    public void reappliesVisibilityToChangedLeash() {

        verifyZeroInteractions(mT);

        mPerDisplay.mImeShowing = true;

        mPerDisplay.mImeShowing = false;



        mPerDisplay.insetsControlChanged(insetsStateWithIme(false), insetsSourceControl());