Merge "Allow non-resizable apps in split-screen (9/n)" into sc-dev (cab4131e) · Commits · e / os / android_frameworks_base

core/java/android/app/ITaskStackListener.aidl

+0 −12

Original line number	Diff line number	Diff line
		@@ -144,18 +144,6 @@ oneway interface ITaskStackListener {
		*/
		void onTaskSnapshotChanged(int taskId, in TaskSnapshot snapshot);

		/**
		* Called when the resumed activity is in size compatibility mode and its override configuration
		* is different from the current one of system.
		*
		* @param displayId Id of the display where the activity resides.
		* @param activityToken Token of the size compatibility mode activity. It will be null when
		* switching to a activity that is not in size compatibility mode or the
		* configuration of the activity.
		* @see com.android.server.wm.ActivityRecord#inSizeCompatMode
		*/
		void onSizeCompatModeActivityChanged(int displayId, in IBinder activityToken);

		/**
		* Reports that an Activity received a back key press when there were no additional activities
		* on the back stack.

core/java/android/app/TaskStackListener.java

+0 −7

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@ import android.compat.annotation.UnsupportedAppUsage;
		import android.content.ComponentName;
		import android.os.Binder;
		import android.os.Build;
		import android.os.IBinder;
		import android.os.RemoteException;
		import android.window.TaskSnapshot;

		@@ -162,12 +161,6 @@ public abstract class TaskStackListener extends ITaskStackListener.Stub {
		}
		}

		@Override
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.R, trackingBug = 170729553)
		public void onSizeCompatModeActivityChanged(int displayId, IBinder activityToken)
		throws RemoteException {
		}

		@Override
		public void onBackPressedOnTaskRoot(RunningTaskInfo taskInfo)
		throws RemoteException {

libs/WindowManager/Shell/src/com/android/wm/shell/common/TaskStackListenerCallback.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.wm.shell.common;
		import android.app.ActivityManager.RunningTaskInfo;
		import android.app.ITaskStackListener;
		import android.content.ComponentName;
		import android.os.IBinder;
		import android.window.TaskSnapshot;

		import androidx.annotation.BinderThread;
		@@ -85,6 +84,4 @@ public interface TaskStackListenerCallback {
		default void onActivityRequestedOrientationChanged(int taskId, int requestedOrientation) { }

		default void onActivityRotation(int displayId) { }

		default void onSizeCompatModeActivityChanged(int displayId, IBinder activityToken) { }
		}

libs/WindowManager/Shell/src/com/android/wm/shell/common/TaskStackListenerImpl.java

+6 −22

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.app.IActivityTaskManager;
		import android.app.TaskStackListener;
		import android.content.ComponentName;
		import android.os.Handler;
		import android.os.IBinder;
		import android.os.Message;
		import android.os.Trace;
		import android.util.Log;
		@@ -54,13 +53,12 @@ public class TaskStackListenerImpl extends TaskStackListener implements Handler.
		private static final int ON_TASK_MOVED_TO_FRONT = 12;
		private static final int ON_ACTIVITY_REQUESTED_ORIENTATION_CHANGE = 13;
		private static final int ON_ACTIVITY_LAUNCH_ON_SECONDARY_DISPLAY_REROUTED = 14;
		private static final int ON_SIZE_COMPAT_MODE_ACTIVITY_CHANGED = 15;
		private static final int ON_BACK_PRESSED_ON_TASK_ROOT = 16;
		private static final int ON_TASK_DISPLAY_CHANGED = 17;
		private static final int ON_TASK_LIST_UPDATED = 18;
		private static final int ON_TASK_LIST_FROZEN_UNFROZEN = 19;
		private static final int ON_TASK_DESCRIPTION_CHANGED = 20;
		private static final int ON_ACTIVITY_ROTATION = 21;
		private static final int ON_BACK_PRESSED_ON_TASK_ROOT = 15;
		private static final int ON_TASK_DISPLAY_CHANGED = 16;
		private static final int ON_TASK_LIST_UPDATED = 17;
		private static final int ON_TASK_LIST_FROZEN_UNFROZEN = 18;
		private static final int ON_TASK_DESCRIPTION_CHANGED = 19;
		private static final int ON_ACTIVITY_ROTATION = 20;

		/**
		* List of {@link TaskStackListenerCallback} registered from {@link #addListener}.
		@@ -263,13 +261,6 @@ public class TaskStackListenerImpl extends TaskStackListener implements Handler.
		.sendToTarget();
		}

		@Override
		public void onSizeCompatModeActivityChanged(int displayId, IBinder activityToken) {
		mMainHandler.obtainMessage(ON_SIZE_COMPAT_MODE_ACTIVITY_CHANGED, displayId,
		0 /* unused */,
		activityToken).sendToTarget();
		}

		@Override
		public boolean handleMessage(Message msg) {
		synchronized (mTaskStackListeners) {
		@@ -383,13 +374,6 @@ public class TaskStackListenerImpl extends TaskStackListener implements Handler.
		}
		break;
		}
		case ON_SIZE_COMPAT_MODE_ACTIVITY_CHANGED: {
		for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) {
		mTaskStackListeners.get(i).onSizeCompatModeActivityChanged(
		msg.arg1, (IBinder) msg.obj);
		}
		break;
		}
		case ON_BACK_PRESSED_ON_TASK_ROOT: {
		for (int i = mTaskStackListeners.size() - 1; i >= 0; i--) {
		mTaskStackListeners.get(i).onBackPressedOnTaskRoot(

libs/WindowManager/Shell/src/com/android/wm/shell/sizecompatui/SizeCompatUIController.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -91,7 +91,6 @@ public class SizeCompatUIController implements DisplayController.OnDisplaysChang
		}
		}

		// TODO move from SizeCompatModeActivityController from system UI.
		@Override
		public void onDisplayRemoved(int displayId) {
		mDisplayContextCache.remove(displayId);