Merge "Keep ime information up-to-date even when divider invisible" into rvc-dev am: fece74693d

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

Change-Id: I8d642e40e2b4935dedc9c8d9b82a0c7a6fe08ce5
This commit is contained in:
Evan Rosky
2020-06-19 16:10:36 +00:00
committed by Automerger Merge Worker

View File

@@ -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)) {