Merge "[PIP] Split implementation of isPackageActiveInPip for PIP1 and PIP2" into main (4353a8df) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -73,6 +73,7 @@ import com.android.wm.shell.common.pip.PipBoundsState;
		import com.android.wm.shell.common.pip.PipDisplayLayoutState;
		import com.android.wm.shell.common.pip.PipMenuController;
		import com.android.wm.shell.common.pip.PipUtils;
		import com.android.wm.shell.common.split.SplitScreenUtils;
		import com.android.wm.shell.protolog.ShellProtoLogGroup;
		import com.android.wm.shell.shared.TransitionUtil;
		import com.android.wm.shell.shared.pip.PipContentOverlay;
		@@ -1346,6 +1347,13 @@ public class PipTransition extends PipTransitionController {
		return true;
		}

		@Override
		public boolean isPackageActiveInPip(@Nullable String packageName) {
		final TaskInfo inPipTask = mPipOrganizer.getTaskInfo();
		return packageName != null && inPipTask != null && mPipOrganizer.isInPip()
		&& packageName.equals(SplitScreenUtils.getPackageName(inPipTask.baseIntent));
		}

		private void updatePipForUnhandledTransition(@NonNull TransitionInfo.Change pipChange,
		@NonNull SurfaceControl.Transaction startTransaction,
		@NonNull SurfaceControl.Transaction finishTransaction) {

+2 −3

Original line number	Diff line number	Diff line
		@@ -312,9 +312,8 @@ public abstract class PipTransitionController implements Transitions.TransitionH

		/** Whether a particular package is same as current pip package. */
		public boolean isPackageActiveInPip(@Nullable String packageName) {
		return packageName != null
		&& mPipBoundsState.getLastPipComponentName() != null
		&& packageName.equals(mPipBoundsState.getLastPipComponentName().getPackageName());
		// No-op, to be handled differently in PIP1 and PIP2
		return false;
		}

		/** Add PiP-related changes to `outWCT` for the given request. */

+7 −0

Original line number	Diff line number	Diff line
		@@ -915,4 +915,11 @@ public class PipTransition extends PipTransitionController implements
		break;
		}
		}

		@Override
		public boolean isPackageActiveInPip(@Nullable String packageName) {
		return packageName != null
		&& mPipBoundsState.getLastPipComponentName() != null
		&& packageName.equals(mPipBoundsState.getLastPipComponentName().getPackageName());
		}
		}