Merge "Prevent cancel entering split due to animation got canceled" into tm-qpr-dev (788f62ae) · Commits · e / os / android_frameworks_base

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

+12 −2

Original line number	Original line	Diff line number	Diff line
	@@ -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);