Merge "Remove supportsSplitScreenMultiWindow" into tm-qpr-dev (0a066377) · Commits · e / os / android_frameworks_base

core/java/android/app/ActivityManager.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -2210,7 +2210,6 @@ public class ActivityManager {
		pw.print(((baseIntent.getFlags() & FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS) != 0));
		pw.print(" activityType="); pw.print(activityTypeToString(getActivityType()));
		pw.print(" windowingMode="); pw.print(windowingModeToString(getWindowingMode()));
		pw.print(" supportsSplitScreenMultiWindow="); pw.print(supportsSplitScreenMultiWindow);
		pw.print(" supportsMultiWindow=");
		pw.println(supportsMultiWindow);
		if (taskDescription != null) {

+0 −10

Original line number	Diff line number	Diff line
		@@ -142,13 +142,6 @@ public class TaskInfo {
		@Nullable
		public LocusId mTopActivityLocusId;

		/**
		* True if the task can go in the split-screen primary stack.
		* @hide
		*/
		@UnsupportedAppUsage
		public boolean supportsSplitScreenMultiWindow;

		/**
		* Whether this task supports multi windowing modes based on the device settings and the
		* root activity resizability and configuration.
		@@ -516,7 +509,6 @@ public class TaskInfo {
		lastActiveTime = source.readLong();

		taskDescription = source.readTypedObject(ActivityManager.TaskDescription.CREATOR);
		supportsSplitScreenMultiWindow = source.readBoolean();
		supportsMultiWindow = source.readBoolean();
		resizeMode = source.readInt();
		configuration.readFromParcel(source);
		@@ -563,7 +555,6 @@ public class TaskInfo {
		dest.writeLong(lastActiveTime);

		dest.writeTypedObject(taskDescription, flags);
		dest.writeBoolean(supportsSplitScreenMultiWindow);
		dest.writeBoolean(supportsMultiWindow);
		dest.writeInt(resizeMode);
		configuration.writeToParcel(dest, flags);
		@@ -601,7 +592,6 @@ public class TaskInfo {
		+ " realActivity=" + realActivity
		+ " numActivities=" + numActivities
		+ " lastActiveTime=" + lastActiveTime
		+ " supportsSplitScreenMultiWindow=" + supportsSplitScreenMultiWindow
		+ " supportsMultiWindow=" + supportsMultiWindow
		+ " resizeMode=" + resizeMode
		+ " isResizeable=" + isResizeable

+1 −1

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ public class PipMenuView extends FrameLayout {
		&& mSplitScreenControllerOptional.get().isTaskInSplitScreen(taskInfo.taskId);
		mFocusedTaskAllowSplitScreen = isSplitScreen
		\|\| (taskInfo.getWindowingMode() == WINDOWING_MODE_FULLSCREEN
		&& taskInfo.supportsSplitScreenMultiWindow
		&& taskInfo.supportsMultiWindow
		&& taskInfo.topActivityType != WindowConfiguration.ACTIVITY_TYPE_HOME);
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -243,7 +243,7 @@ public class Task {
		return new Task(taskKey,
		td != null ? td.getPrimaryColor() : 0,
		td != null ? td.getBackgroundColor() : 0,
		taskInfo.supportsSplitScreenMultiWindow, isLocked, td, taskInfo.topActivity);
		taskInfo.supportsMultiWindow, isLocked, td, taskInfo.topActivity);
		}

		public Task(TaskKey key) {

+0 −19

Original line number	Diff line number	Diff line
		@@ -2995,25 +2995,6 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
		&& info.supportsPictureInPicture();
		}

		/**
		* @return whether this activity supports split-screen multi-window and can be put in
		* split-screen.
		*/
		@Override
		public boolean supportsSplitScreenWindowingMode() {
		return supportsSplitScreenWindowingModeInDisplayArea(getDisplayArea());
		}

		/**
		* @return whether this activity supports split-screen multi-window and can be put in
		* split-screen if it is in the given {@link TaskDisplayArea}.
		*/
		boolean supportsSplitScreenWindowingModeInDisplayArea(@Nullable TaskDisplayArea tda) {
		return super.supportsSplitScreenWindowingMode()
		&& mAtmService.mSupportsSplitScreenMultiWindow
		&& supportsMultiWindowInDisplayArea(tda);
		}

		boolean supportsFreeform() {
		return supportsFreeformInDisplayArea(getDisplayArea());
		}