Merge "Add multi-display support to shell transitions" into sc-v2-dev (2f7eef82) · Commits · e / os / android_frameworks_base

data/etc/services.core.protolog.json

+24 −0

Original line number	Diff line number	Diff line
		@@ -181,6 +181,12 @@
		"group": "WM_DEBUG_STARTING_WINDOW",
		"at": "com\/android\/server\/wm\/ActivityRecord.java"
		},
		"-1924376693": {
		"message": " Setting Ready-group to %b. group=%s from %s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/Transition.java"
		},
		"-1918702467": {
		"message": "onSyncFinishedDrawing %s",
		"level": "VERBOSE",
		@@ -607,6 +613,12 @@
		"group": "WM_ERROR",
		"at": "com\/android\/server\/wm\/WindowManagerService.java"
		},
		"-1442613680": {
		"message": " Creating Ready-group for Transition %d with root=%s",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/Transition.java"
		},
		"-1438175584": {
		"message": "Input focus has changed to %s display=%d",
		"level": "VERBOSE",
		@@ -2209,6 +2221,12 @@
		"group": "WM_DEBUG_ADD_REMOVE",
		"at": "com\/android\/server\/wm\/ActivityRecord.java"
		},
		"352982444": {
		"message": " allReady query: used=%b override=%b states=[%s]",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/Transition.java"
		},
		"355720268": {
		"message": "stopFreezingDisplayLocked: Unfreezing now",
		"level": "DEBUG",
		@@ -3277,6 +3295,12 @@
		"group": "WM_DEBUG_IME",
		"at": "com\/android\/server\/wm\/InsetsStateController.java"
		},
		"1670933628": {
		"message": " Setting allReady override",
		"level": "VERBOSE",
		"group": "WM_DEBUG_WINDOW_TRANSITIONS",
		"at": "com\/android\/server\/wm\/Transition.java"
		},
		"1671994402": {
		"message": "Nulling last startingData",
		"level": "VERBOSE",

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1620,7 +1620,7 @@ class ActivityStarter {
		mTargetTask, remoteTransition);
		} else if (started) {
		// Make the collecting transition wait until this request is ready.
		mService.getTransitionController().setReady(false);
		mService.getTransitionController().setReady(r, false);
		}
		}
		}

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1359,7 +1359,8 @@ public class ActivityTaskSupervisor implements RecentTasks.Callbacks {
		}

		mService.getTransitionController().requestTransitionIfNeeded(TRANSIT_TO_FRONT,
		0 /* flags */, task, options != null ? options.getRemoteTransition() : null);
		0 /* flags /, task, task / readyGroupRef */,
		options != null ? options.getRemoteTransition() : null);
		reason = reason + " findTaskToMoveToFront";
		boolean reparented = false;
		if (task.isResizeable() && canUseActivityOptionsLaunchBounds(options)) {

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

+7 −4

Original line number	Diff line number	Diff line
		@@ -2987,7 +2987,10 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp

		@Override
		void removeIfPossible() {
		if (isAnimating(TRANSITION \| PARENTS)) {
		if (isAnimating(TRANSITION \| PARENTS)
		// isAnimating is a legacy transition query and will be removed, so also add a
		// check for whether this is in a shell-transition when not using legacy.
		\|\| mAtmService.getTransitionController().inTransition()) {
		mDeferredRemoval = true;
		return;
		}
		@@ -4989,7 +4992,7 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		@WindowManager.TransitionFlags int flags) {
		prepareAppTransition(transit, flags);
		mAtmService.getTransitionController().requestTransitionIfNeeded(transit, flags,
		null /* trigger */);
		null /* trigger */, this);
		}

		/** @see #requestTransitionAndLegacyPrepare(int, int) */
		@@ -4997,11 +5000,11 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp
		@Nullable WindowContainer trigger) {
		prepareAppTransition(transit);
		mAtmService.getTransitionController().requestTransitionIfNeeded(transit, 0 /* flags */,
		trigger);
		trigger, this);
		}

		void executeAppTransition() {
		mAtmService.getTransitionController().setReady();
		mAtmService.getTransitionController().setReady(this);
		if (mAppTransition.isTransitionSet()) {
		ProtoLog.w(WM_DEBUG_APP_TRANSITIONS,
		"Execute app transition: %s, displayId: %d Callers=%s",

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

+5 −0

Original line number	Diff line number	Diff line
		@@ -508,6 +508,11 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
		mTaskSupervisor.updateTopResumedActivityIfNeeded();
		}

		@Override
		boolean isAttached() {
		return true;
		}

		/**
		* Called when DisplayWindowSettings values may change.
		*/