Merge "Don't animate when moving task to stack if not requested" (c4d81e53) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/am/ActivityStackSupervisor.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -3114,7 +3114,7 @@ public final class ActivityStackSupervisor implements DisplayListener {
		for (int i = 0; i < count; i++) {
		moveTaskToStackLocked(tasks.get(i).taskId,
		FULLSCREEN_WORKSPACE_STACK_ID, ON_TOP, FORCE_FOCUS, "resizeStack",
		true /* animate */);
		false /* animate */);
		}

		// stack shouldn't contain anymore activities, so nothing to resume.
		@@ -3376,6 +3376,10 @@ public final class ActivityStackSupervisor implements DisplayListener {
		final ActivityStack stack = moveTaskToStackUncheckedLocked(
		task, stackId, toTop, forceFocus, "moveTaskToStack:" + reason);

		if (!animate) {
		stack.mNoAnimActivities.add(topActivity);
		}

		// Make sure the task has the appropriate bounds/size for the stack it is in.
		if (stackId == FULLSCREEN_WORKSPACE_STACK_ID && task.mBounds != null) {
		resizeTaskLocked(task, stack.mBounds, RESIZE_MODE_SYSTEM, !PRESERVE_WINDOWS);