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

Merge "Make sure to clear outdated screenshot of splitting tasks" into tm-qpr-dev am: 64dd311dec

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

Change-Id: I9f3efb866b68bd533622bc734d575addbbf99989
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Winson Chung
2023-04-17 23:12:55 +00:00
committed by Automerger Merge Worker
parent 3a9314222d 64dd311dec
commit f81b7bcd96
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -164,6 +164,10 @@ public class SplitDecorManager extends WindowlessWindowManager {
t.remove(mGapBackgroundLeash); t.remove(mGapBackgroundLeash);
mGapBackgroundLeash = null; mGapBackgroundLeash = null;
} }
if (mScreenshot != null) {
t.remove(mScreenshot);
mScreenshot = null;
}
mHostLeash = null; mHostLeash = null;
mIcon = null; mIcon = null;
mResizingIconView = null; mResizingIconView = null;
@@ -323,6 +327,8 @@ public class SplitDecorManager extends WindowlessWindowManager {
if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) { if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {
if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) { if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) {
mScreenshotAnimator.cancel(); mScreenshotAnimator.cancel();
} else if (mScreenshot != null) {
t.remove(mScreenshot);
} }
mTempRect.set(mOldBounds); mTempRect.set(mOldBounds);
@@ -339,6 +345,8 @@ public class SplitDecorManager extends WindowlessWindowManager {
if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) { if (!mShown && mIsResizing && !mOldBounds.equals(mResizingBounds)) {
if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) { if (mScreenshotAnimator != null && mScreenshotAnimator.isRunning()) {
mScreenshotAnimator.cancel(); mScreenshotAnimator.cancel();
} else if (mScreenshot != null) {
t.remove(mScreenshot);
} }
mScreenshot = screenshot; mScreenshot = screenshot;