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

Commit 0be69088 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Prevent caching unexpected IME status while showing keyguard in split"... 

Merge "Prevent caching unexpected IME status while showing keyguard in split" into sc-dev am: f3b52188

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

Change-Id: Ie27353e52e433e9edd5e8579dd4dfe0f22035f8f
parents d8b8cbc0 f3b52188

libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/DividerImeController.java

+6 −5
Original line number Diff line number Diff line
@@ -109,8 +109,9 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor 
        return mSplits.mSplitScreenController.getSplitLayout();

    }



    private boolean isDividerVisible() {

        return mSplits.mSplitScreenController.isDividerVisible();

    private boolean isDividerHidden() {

        final DividerView view = mSplits.mSplitScreenController.getDividerView();

        return view == null || view.isHidden();

    }



    private boolean getSecondaryHasFocus(int displayId) {
@@ -143,7 +144,7 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor 
    @ImeAnimationFlags

    public int onImeStartPositioning(int displayId, int hiddenTop, int shownTop,

            boolean imeShouldShow, boolean imeIsFloating, SurfaceControl.Transaction t) {

        if (!isDividerVisible()) {

        if (isDividerHidden()) {

            return 0;

        }

        mHiddenTop = hiddenTop;
@@ -263,7 +264,7 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor 
    @Override

    public void onImePositionChanged(int displayId, int imeTop,

            SurfaceControl.Transaction t) {

        if (mAnimation != null || !isDividerVisible() || mPaused) {

        if (mAnimation != null || isDividerHidden() || mPaused) {

            // Not synchronized with IME anymore, so return.

            return;

        }
@@ -275,7 +276,7 @@ class DividerImeController implements DisplayImeController.ImePositionProcessor 
    @Override

    public void onImeEndPositioning(int displayId, boolean cancelled,

            SurfaceControl.Transaction t) {

        if (mAnimation != null || !isDividerVisible() || mPaused) {

        if (mAnimation != null || isDividerHidden() || mPaused) {

            // Not synchronized with IME anymore, so return.

            return;

        }