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

Commit e73cdc77 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22624779']... 

Merge cherrypicks of ['googleplex-android-review.googlesource.com/22624779'] into sparse-9960280-L07400000960073385.
SPARSE_CHANGE: Ia159deccc8f0024143200e4dd44fadf67974a198

Change-Id: I3773fd2ef819f2b1d7c01d670923eb463f396f4e
parents 9aa90a3b d7c900f4

libs/WindowManager/Shell/src/com/android/wm/shell/common/split/SplitDecorManager.java

+8 −0
Original line number Diff line number Diff line
@@ -164,6 +164,10 @@ public class SplitDecorManager extends WindowlessWindowManager { 
            t.remove(mGapBackgroundLeash);

            mGapBackgroundLeash = null;

        }

        if (mScreenshot != null) {

            t.remove(mScreenshot);

            mScreenshot = null;

        }

        mHostLeash = null;

        mIcon = null;

        mResizingIconView = null;
@@ -323,6 +327,8 @@ public class SplitDecorManager extends WindowlessWindowManager { 
        if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {

            if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) {

                mScreenshotAnimator.cancel();

            } else if (mScreenshot != null) {

                t.remove(mScreenshot);

            }



            mTempRect.set(mOldBounds);
@@ -339,6 +345,8 @@ public class SplitDecorManager extends WindowlessWindowManager { 
        if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {

            if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) {

                mScreenshotAnimator.cancel();

            } else if (mScreenshot != null) {

                t.remove(mScreenshot);

            }



            mScreenshot = screenshot;