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

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

Browse Source 
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
parent 204473a07f 302f9bd796
commit c83efa9bb0
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

@@ -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();