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

Merge "Reset Divider IME state when leaving split-screen" into rvc-dev

Browse Source
This commit is contained in:
Evan Rosky
2020-07-14 23:38:13 +00:00
committed by Android (Google) Code Review
parent f65210f9ca 83be935e65
commit 45e23b280b
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
View File

@@ -529,6 +529,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
updateVisibility(false /* visible */); updateVisibility(false /* visible */);
mMinimized = false; mMinimized = false;
removeDivider(); removeDivider();
mImePositionProcessor.reset();
} }
void ensureMinimizedSplit() { void ensureMinimizedSplit() {

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

@@ -117,6 +117,18 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor
&& (imeSplit.asBinder() == mSplits.mSecondary.token.asBinder()); && (imeSplit.asBinder() == mSplits.mSecondary.token.asBinder());
} }
void reset() {
mPaused = true;
mPausedTargetAdjusted = false;
mAdjustedWhileHidden = false;
mAnimation = null;
mAdjusted = mTargetAdjusted = false;
mImeWasShown = mTargetShown = false;
mTargetPrimaryDim = mTargetSecondaryDim = mLastPrimaryDim = mLastSecondaryDim = 0.f;
mSecondaryHasFocus = false;
mLastAdjustTop = -1;
}
private void updateDimTargets() { private void updateDimTargets() {
final boolean splitIsVisible = !getView().isHidden(); final boolean splitIsVisible = !getView().isHidden();
mTargetPrimaryDim = (mSecondaryHasFocus && mTargetShown && splitIsVisible) mTargetPrimaryDim = (mSecondaryHasFocus && mTargetShown && splitIsVisible)