Merge "Set cookie-based pending task listener if possible" into main (7c091e2f) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleTransitions.java

+9 −7

Original line number	Diff line number	Diff line
		@@ -557,9 +557,9 @@ public class BubbleTransitions {
		mPlayConvertTaskAnimation = false;
		for (int i = info.getChanges().size() - 1; i >= 0; i--) {
		final TransitionInfo.Change chg = info.getChanges().get(i);
		final boolean isTaskToConvertToBubble = (chg.getTaskInfo() != null)
		final boolean isLaunchedTask = (chg.getTaskInfo() != null)
		&& (chg.getMode() == TRANSIT_CHANGE \|\| isOpeningMode(chg.getMode()));
		if (isTaskToConvertToBubble) {
		if (isLaunchedTask) {
		mStartBounds.set(chg.getStartAbsBounds());
		// Converting a task into taskview, so treat as "new"
		mFinishWct = new WindowContainerTransaction();
		@@ -802,6 +802,11 @@ public class BubbleTransitions {
		}
		}

		// Add the task view task listener manually since we aren't going through
		// TaskViewTransitions (which normally sets up the listener via a pending launch cookie
		mTaskOrganizer.setPendingLaunchCookieListener(mLaunchCookie.binder,
		mBubble.getTaskView().getController());

		// We use a stub transition here since we don't know what is incoming, but it
		// won't actually match any transition when queried in TaskViewTransitions,
		// which is Ok since we don't want TaskViewTransitions to handle this anyways.
		@@ -865,10 +870,10 @@ public class BubbleTransitions {
		mPlayConvertTaskAnimation = false;
		for (int i = info.getChanges().size() - 1; i >= 0; i--) {
		final TransitionInfo.Change chg = info.getChanges().get(i);
		final boolean isTaskToConvertToBubble = (chg.getTaskInfo() != null)
		final boolean isLaunchedTask = (chg.getTaskInfo() != null)
		&& (chg.getMode() == TRANSIT_CHANGE \|\| isOpeningMode(chg.getMode()))
		&& (chg.getTaskInfo().launchCookies.contains(mLaunchCookie.binder));
		if (isTaskToConvertToBubble) {
		if (isLaunchedTask) {
		mStartBounds.set(chg.getStartAbsBounds());
		// Converting a task into taskview, so treat as "new"
		mFinishWct = new WindowContainerTransaction();
		@@ -975,9 +980,6 @@ public class BubbleTransitions {
		}
		mTaskViewTransitions.prepareOpenAnimation(tv, true /* new */, startT, mFinishT,
		(ActivityManager.RunningTaskInfo) mTaskInfo, mTaskLeash, mFinishWct);
		// Add the task view task listener manually since we aren't going through
		// TaskViewTransitions (which normally sets up the listener via a pending launch cookie
		mTaskOrganizer.addListenerForTaskId(tv, mTaskInfo.taskId);

		if (mFinishWct.isEmpty()) {
		mFinishWct = null;