Merge "Fix divider not updated when moving split-tasks from fold -> unfold" into udc-dev (b598f03f) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldTransitionHandler.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,8 @@ package com.android.wm.shell.unfold;

		import static android.view.WindowManager.TRANSIT_CHANGE;

		import static com.android.wm.shell.protolog.ShellProtoLogGroup.WM_SHELL_TRANSITIONS;

		import android.os.IBinder;
		import android.view.SurfaceControl;
		import android.window.TransitionInfo;
		@@ -27,6 +29,7 @@ import android.window.WindowContainerTransaction;
		import androidx.annotation.NonNull;
		import androidx.annotation.Nullable;

		import com.android.internal.protolog.common.ProtoLog;
		import com.android.wm.shell.common.TransactionPool;
		import com.android.wm.shell.sysui.ShellInit;
		import com.android.wm.shell.transition.Transitions;
		@@ -36,6 +39,7 @@ import com.android.wm.shell.unfold.ShellUnfoldProgressProvider.UnfoldListener;
		import com.android.wm.shell.unfold.animation.FullscreenUnfoldTaskAnimator;
		import com.android.wm.shell.unfold.animation.SplitTaskUnfoldAnimator;
		import com.android.wm.shell.unfold.animation.UnfoldTaskAnimator;
		import com.android.wm.shell.util.TransitionUtil;

		import java.util.ArrayList;
		import java.util.List;
		@@ -105,8 +109,14 @@ public class UnfoldTransitionHandler implements TransitionHandler, UnfoldListene
		animator.clearTasks();

		info.getChanges().forEach(change -> {
		if (change.getTaskInfo() != null
		&& change.getMode() == TRANSIT_CHANGE
		if (change.getTaskInfo() != null) {
		ProtoLog.v(WM_SHELL_TRANSITIONS,
		"startAnimation, check taskInfo: %s, mode: %s, isApplicableTask: %s",
		change.getTaskInfo(), TransitionInfo.modeToString(change.getMode()),
		animator.isApplicableTask(change.getTaskInfo()));
		}
		if (change.getTaskInfo() != null && (change.getMode() == TRANSIT_CHANGE
		\|\| TransitionUtil.isOpeningType(change.getMode()))
		&& animator.isApplicableTask(change.getTaskInfo())) {
		animator.onTaskAppeared(change.getTaskInfo(), change.getLeash());
		}

libs/WindowManager/Shell/src/com/android/wm/shell/unfold/animation/SplitTaskUnfoldAnimator.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -213,7 +213,7 @@ public class SplitTaskUnfoldAnimator implements UnfoldTaskAnimator,
		@Override
		public boolean isApplicableTask(TaskInfo taskInfo) {
		return taskInfo.hasParentTask()
		&& taskInfo.isVisible
		&& taskInfo.isRunning
		&& taskInfo.realActivity != null // to filter out parents created by organizer
		&& taskInfo.getWindowingMode() == WINDOWING_MODE_MULTI_WINDOW;
		}