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

Commit e4ec0751 authored by Tony Huang's avatar Tony Huang Committed by Jerry Chang
Browse files

Make sure to clear outdated screenshot of splitting tasks 

Make sure to clear the screenshot of splitting tasks if it's taking the
new one or being dismissed from split.

Bug: 272420717
Bug: 278134600
Test: pass existing tests
Change-Id: Ia159deccc8f0024143200e4dd44fadf67974a198
parent 6eda1790

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;