Merge "Prevent caching unexpected IME shown state for legacy split" into rvc-qpr-dev am: 302f9bd796

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

Change-Id: I0af5e8320598a30373a07759a723a8cb2aa06278
This commit is contained in:
TreeHugger Robot
2021-03-24 03:18:26 +00:00
committed by Automerger Merge Worker

View File

@@ -141,14 +141,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.mDivider.isMinimized();