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

Commit 4e722803 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Keep ime information up-to-date even when divider invisible" into... 

Merge "Keep ime information up-to-date even when divider invisible" into rvc-dev am: fece7469 am: 740ab27c am: 27e3cf16

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

Change-Id: Ia5efd1540b358a969dc7ed6873a691538ff7c811
parents 1570ef20 27e3cf16

packages/SystemUI/src/com/android/systemui/stackdivider/DividerImeController.java

+4 −4
Original line number Diff line number Diff line
@@ -126,16 +126,16 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor 
    @Override

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

            boolean imeShouldShow, SurfaceControl.Transaction t) {

        mHiddenTop = hiddenTop;

        mShownTop = shownTop;

        mTargetShown = imeShouldShow;

        if (!isDividerVisible()) {

            return;

        }

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

        mSecondaryHasFocus = getSecondaryHasFocus(displayId);

        final boolean targetAdjusted = splitIsVisible && imeShouldShow && mSecondaryHasFocus

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

        mHiddenTop = hiddenTop;

        mShownTop = shownTop;

        mTargetShown = imeShouldShow;

                && !getLayout().mDisplayLayout.isLandscape() && !mSplits.mDivider.isMinimized();

        if (mLastAdjustTop < 0) {

            mLastAdjustTop = imeShouldShow ? hiddenTop : shownTop;

        } else if (mLastAdjustTop != (imeShouldShow ? mShownTop : mHiddenTop)) {