Merge "Prevent caching unexpected IME shown state for legacy split" into rvc-qpr-dev (302f9bd7) · Commits · e / os / android_frameworks_base

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

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -141,14 +141,14 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor
	@ImeAnimationFlags		@ImeAnimationFlags
	public int onImeStartPositioning(int displayId, int hiddenTop, int shownTop,		public int onImeStartPositioning(int displayId, int hiddenTop, int shownTop,
	boolean imeShouldShow, boolean imeIsFloating, SurfaceControl.Transaction t) {		boolean imeShouldShow, boolean imeIsFloating, SurfaceControl.Transaction t) {
	mHiddenTop = hiddenTop;
	mShownTop = shownTop;
	mTargetShown = imeShouldShow;
	if (!isDividerVisible()) {		if (!isDividerVisible()) {
	return 0;		return 0;
	}		}
	final boolean splitIsVisible = !getView().isHidden();		mHiddenTop = hiddenTop;
			mShownTop = shownTop;
			mTargetShown = imeShouldShow;
	mSecondaryHasFocus = getSecondaryHasFocus(displayId);		mSecondaryHasFocus = getSecondaryHasFocus(displayId);
			final boolean splitIsVisible = !getView().isHidden();
	final boolean targetAdjusted = splitIsVisible && imeShouldShow && mSecondaryHasFocus		final boolean targetAdjusted = splitIsVisible && imeShouldShow && mSecondaryHasFocus
	&& !imeIsFloating && !getLayout().mDisplayLayout.isLandscape()		&& !imeIsFloating && !getLayout().mDisplayLayout.isLandscape()
	&& !mSplits.mDivider.isMinimized();		&& !mSplits.mDivider.isMinimized();