Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a2ada02 authored by Evan Rosky's avatar Evan Rosky Committed by Automerger Merge Worker
Browse files

Merge "Reset Divider IME state when leaving split-screen" into rvc-dev am: 45e23b28 

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

Change-Id: I5ab2278265f3fe198b51fa6a02e8619a96c89f55
parents eecfa86e 45e23b28

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

+1 −0
Original line number Diff line number Diff line
@@ -529,6 +529,7 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks, 
        updateVisibility(false /* visible */);

        mMinimized = false;

        removeDivider();

        mImePositionProcessor.reset();

    }



    void ensureMinimizedSplit() {

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

+12 −0
Original line number Diff line number Diff line
@@ -117,6 +117,18 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor 
                && (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() {

        final boolean splitIsVisible = !getView().isHidden();

        mTargetPrimaryDim = (mSecondaryHasFocus && mTargetShown && splitIsVisible)