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

Merge "Prevent cancel entering split due to animation got canceled" into tm-qpr-dev am: 788f62aed4 am: e75c1a2633

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

Change-Id: I6f7beeccb666ad81082ead771b99bf2ef68f41d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jerry Chang
2023-02-17 06:31:27 +00:00
committed by Automerger Merge Worker
parent 96bf0b1de1 e75c1a2633
commit 1a078491d1
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java
View File

@@ -499,6 +499,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
break; break;
} }
} }
} else if (mSideStage.getChildCount() != 0) {
// There are chances the entering app transition got canceled by performing
// rotation transition. Checks if there is any child task existed in split
// screen before fallback to cancel entering flow.
openingToSide = true;
} }
if (isEnteringSplit && !openingToSide) { if (isEnteringSplit && !openingToSide) {
@@ -515,7 +520,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
} }
} }
if (!isEnteringSplit && openingToSide) { if (!isEnteringSplit && apps != null) {
final WindowContainerTransaction evictWct = new WindowContainerTransaction(); final WindowContainerTransaction evictWct = new WindowContainerTransaction();
prepareEvictNonOpeningChildTasks(position, apps, evictWct); prepareEvictNonOpeningChildTasks(position, apps, evictWct);
mSyncQueue.queue(evictWct); mSyncQueue.queue(evictWct);
@@ -598,6 +603,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
break; break;
} }
} }
} else if (mSideStage.getChildCount() != 0) {
// There are chances the entering app transition got canceled by performing
// rotation transition. Checks if there is any child task existed in split
// screen before fallback to cancel entering flow.
openingToSide = true;
} }
if (isEnteringSplit && !openingToSide && apps != null) { if (isEnteringSplit && !openingToSide && apps != null) {
@@ -624,7 +634,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
} }
if (!isEnteringSplit && openingToSide) { if (!isEnteringSplit && apps != null) {
final WindowContainerTransaction evictWct = new WindowContainerTransaction(); final WindowContainerTransaction evictWct = new WindowContainerTransaction();
prepareEvictNonOpeningChildTasks(position, apps, evictWct); prepareEvictNonOpeningChildTasks(position, apps, evictWct);
mSyncQueue.queue(evictWct); mSyncQueue.queue(evictWct);