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

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

Merge "Prevent caching unexpected IME shown state for legacy split" into sc-dev am: cb320bf9 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3991a8c5d8cd94444533e04bcbe40e52e3b2ed0c
parents b77a83bf cb320bf9

libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerImeController.java

+4 −4
Original line number Diff line number Diff line
@@ -143,14 +143,14 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor 
    @ImeAnimationFlags

    public int onImeStartPositioning(int displayId, int hiddenTop, int shownTop,

            boolean imeShouldShow, boolean imeIsFloating, SurfaceControl.Transaction t) {

        mHiddenTop = hiddenTop;

        mShownTop = shownTop;

        mTargetShown = imeShouldShow;

        if (!isDividerVisible()) {

            return 0;

        }

        final boolean splitIsVisible = !getView().isHidden();

        mHiddenTop = hiddenTop;

        mShownTop = shownTop;

        mTargetShown = imeShouldShow;

        mSecondaryHasFocus = getSecondaryHasFocus(displayId);

        final boolean splitIsVisible = !getView().isHidden();

        final boolean targetAdjusted = splitIsVisible && imeShouldShow && mSecondaryHasFocus

                && !imeIsFloating && !getLayout().mDisplayLayout.isLandscape()

                && !mSplits.mSplitScreenController.isMinimized();