Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I2d62b7297c440cccdc04c5241d28e04c397d4644
This commit is contained in:
Evan Rosky
2020-06-19 16:10:49 +00:00
committed by Automerger Merge Worker
parent 0c357baed4 fece74693d
commit 00a6e60537
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SystemUI/src/com/android/systemui/stackdivider/DividerImeController.java
View File

@@ -126,16 +126,16 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor
@Override @Override
public void onImeStartPositioning(int displayId, int hiddenTop, int shownTop, public void onImeStartPositioning(int displayId, int hiddenTop, int shownTop,
boolean imeShouldShow, SurfaceControl.Transaction t) { boolean imeShouldShow, SurfaceControl.Transaction t) {
mHiddenTop = hiddenTop;
mShownTop = shownTop;
mTargetShown = imeShouldShow;
if (!isDividerVisible()) { if (!isDividerVisible()) {
return; return;
} }
final boolean splitIsVisible = !getView().isHidden(); final boolean splitIsVisible = !getView().isHidden();
mSecondaryHasFocus = getSecondaryHasFocus(displayId); mSecondaryHasFocus = getSecondaryHasFocus(displayId);
final boolean targetAdjusted = splitIsVisible && imeShouldShow && mSecondaryHasFocus final boolean targetAdjusted = splitIsVisible && imeShouldShow && mSecondaryHasFocus
&& !getLayout().mDisplayLayout.isLandscape(); && !getLayout().mDisplayLayout.isLandscape() && !mSplits.mDivider.isMinimized();
mHiddenTop = hiddenTop;
mShownTop = shownTop;
mTargetShown = imeShouldShow;
if (mLastAdjustTop < 0) { if (mLastAdjustTop < 0) {
mLastAdjustTop = imeShouldShow ? hiddenTop : shownTop; mLastAdjustTop = imeShouldShow ? hiddenTop : shownTop;
} else if (mLastAdjustTop != (imeShouldShow ? mShownTop : mHiddenTop)) { } else if (mLastAdjustTop != (imeShouldShow ? mShownTop : mHiddenTop)) {