Merge "[Shell-transition]: More checking animating state methods" into tm-dev (1a337e9c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/wm/ActivityRecord.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -3248,7 +3248,8 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		// the best capture timing (e.g. IME window capture),
		// No need additional task capture while task is controlled by RecentsAnimation.
		if (mAtmService.mWindowManager.mTaskSnapshotController != null
		&& !task.isAnimatingByRecents()) {
		&& !(task.isAnimatingByRecents()
		\|\| mTransitionController.inRecentsTransition(task))) {
		final ArraySet<Task> tasks = Sets.newArraySet(task);
		mAtmService.mWindowManager.mTaskSnapshotController.snapshotTasks(tasks);
		mAtmService.mWindowManager.mTaskSnapshotController

+7 −2

Original line number	Diff line number	Diff line
		@@ -534,7 +534,7 @@ class TaskSnapshotController {
		// Since RecentsAnimation will handle task snapshot while switching apps with the
		// best capture timing (e.g. IME window capture),
		// No need additional task capture while task is controlled by RecentsAnimation.
		if (task.isAnimatingByRecents()) {
		if (isAnimatingByRecents(task)) {
		mSkipClosingAppSnapshotTasks.add(task);
		}
		// If the task of the app is not visible anymore, it means no other app in that task
		@@ -686,7 +686,7 @@ class TaskSnapshotController {
		// Since RecentsAnimation will handle task snapshot while switching apps with the best
		// capture timing (e.g. IME window capture), No need additional task capture while task
		// is controlled by RecentsAnimation.
		if (task.isVisible() && !task.isAnimatingByRecents()) {
		if (task.isVisible() && !isAnimatingByRecents(task)) {
		mTmpTasks.add(task);
		}
		});
		@@ -717,6 +717,11 @@ class TaskSnapshotController {
		frame, Type.systemBars(), false /* ignoreVisibility */).toRect();
		}

		private boolean isAnimatingByRecents(@NonNull Task task) {
		return task.isAnimatingByRecents()
		\|\| mService.mAtmService.getTransitionController().inRecentsTransition(task);
		}

		void dump(PrintWriter pw, String prefix) {
		pw.println(prefix + "mHighResTaskSnapshotScale=" + mHighResTaskSnapshotScale);
		pw.println(prefix + "mTaskSnapshotEnabled=" + mTaskSnapshotEnabled);

+23 −1

Original line number	Diff line number	Diff line
		@@ -256,6 +256,28 @@ class TransitionController {
		return false;
		}

		boolean inRecentsTransition(@NonNull WindowContainer wc) {
		for (WindowContainer p = wc; p != null; p = p.getParent()) {
		// TODO(b/221417431): replace this with deterministic snapshots
		if (mCollectingTransition == null) break;
		if ((mCollectingTransition.getFlags() & TRANSIT_FLAG_IS_RECENTS) != 0
		&& mCollectingTransition.mParticipants.contains(wc)) {
		return true;
		}
		}

		for (int i = mPlayingTransitions.size() - 1; i >= 0; --i) {
		for (WindowContainer p = wc; p != null; p = p.getParent()) {
		// TODO(b/221417431): replace this with deterministic snapshots
		if ((mPlayingTransitions.get(i).getFlags() & TRANSIT_FLAG_IS_RECENTS) != 0
		&& mPlayingTransitions.get(i).mParticipants.contains(p)) {
		return true;
		}
		}
		}
		return false;
		}

		/** @return {@code true} if wc is in a participant subtree */
		boolean isTransitionOnDisplay(@NonNull DisplayContent dc) {
		if (mCollectingTransition != null && mCollectingTransition.isOnDisplay(dc)) {

+22 −0

Original line number	Diff line number	Diff line
		@@ -47,6 +47,7 @@ import static com.android.server.wm.IdentifierProto.TITLE;
		import static com.android.server.wm.IdentifierProto.USER_ID;
		import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_ALL;
		import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_APP_TRANSITION;
		import static com.android.server.wm.SurfaceAnimator.ANIMATION_TYPE_RECENTS;
		import static com.android.server.wm.WindowContainer.AnimationFlags.CHILDREN;
		import static com.android.server.wm.WindowContainer.AnimationFlags.PARENTS;
		import static com.android.server.wm.WindowContainer.AnimationFlags.TRANSITION;
		@@ -1173,6 +1174,27 @@ class WindowContainer<E extends WindowContainer> extends ConfigurationContainer<
		return mTransitionController.inTransition(this);
		}

		boolean inAppOrRecentsTransition() {
		if (!mTransitionController.isShellTransitionsEnabled()) {
		return isAnimating(PARENTS \| TRANSITION,
		ANIMATION_TYPE_APP_TRANSITION \| ANIMATION_TYPE_RECENTS);
		}
		for (WindowContainer p = this; p != null; p = p.getParent()) {
		if (mTransitionController.isCollecting(p)) {
		return true;
		}
		}
		if (inTransition() \|\| mTransitionController.inRecentsTransition(this)) return true;

		for (int i = mChildren.size() - 1; i >= 0; --i) {
		WindowContainer child = mChildren.get(i);
		if (child.inAppOrRecentsTransition()) {
		return true;
		}
		}
		return false;
		}

		void sendAppVisibilityToClients() {
		for (int i = mChildren.size() - 1; i >= 0; --i) {
		final WindowContainer wc = mChildren.get(i);