diff options
12 files changed, 109 insertions, 37 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/FullscreenTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/FullscreenTaskListener.java index 59fa9948bc2d..6984ea458ccf 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/FullscreenTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/FullscreenTaskListener.java @@ -95,11 +95,6 @@ public class FullscreenTaskListener implements ShellTaskOrganizer.TaskListener { } @Override - public boolean supportSizeCompatUI() { - return true; - } - - @Override public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { if (!mLeashByTaskId.contains(taskId)) { throw new IllegalArgumentException("There is no surface for taskId=" + taskId); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java index 34a7157dbb3c..efc55c4fbe31 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/ShellTaskOrganizer.java @@ -84,7 +84,8 @@ public class ShellTaskOrganizer extends TaskOrganizer { default void onBackPressedOnTaskRoot(RunningTaskInfo taskInfo) {} /** Whether this task listener supports size compat UI. */ default boolean supportSizeCompatUI() { - return false; + // All TaskListeners should support size compat except PIP. + return true; } /** Attaches the a child window surface to the task surface. */ default void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java index bb8a97344664..5992447bd6da 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/TaskView.java @@ -301,6 +301,14 @@ public class TaskView extends SurfaceView implements SurfaceHolder.Callback, } @Override + public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { + if (mTaskInfo.taskId != taskId) { + throw new IllegalArgumentException("There is no surface for taskId=" + taskId); + } + b.setParent(mTaskLeash); + } + + @Override public void dump(@androidx.annotation.NonNull PrintWriter pw, String prefix) { final String innerPrefix = prefix + " "; final String childPrefix = innerPrefix + " "; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java b/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java index bab5140e2f52..79f9dcd8a1fb 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/apppairs/AppPair.java @@ -214,6 +214,19 @@ class AppPair implements ShellTaskOrganizer.TaskListener, SplitLayout.LayoutChan } @Override + public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { + if (getRootTaskId() == taskId) { + b.setParent(mRootTaskLeash); + } else if (getTaskId1() == taskId) { + b.setParent(mTaskLeash1); + } else if (getTaskId2() == taskId) { + b.setParent(mTaskLeash2); + } else { + throw new IllegalArgumentException("There is no surface for taskId=" + taskId); + } + } + + @Override public void dump(@NonNull PrintWriter pw, String prefix) { final String innerPrefix = prefix + " "; final String childPrefix = innerPrefix + " "; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java index 5a493c234ce3..05526018d73f 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/legacysplitscreen/LegacySplitScreenTaskListener.java @@ -323,6 +323,14 @@ class LegacySplitScreenTaskListener implements ShellTaskOrganizer.TaskListener { } @Override + public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { + if (!mLeashByTaskId.contains(taskId)) { + throw new IllegalArgumentException("There is no surface for taskId=" + taskId); + } + b.setParent(mLeashByTaskId.get(taskId)); + } + + @Override public void dump(@NonNull PrintWriter pw, String prefix) { final String innerPrefix = prefix + " "; final String childPrefix = innerPrefix + " "; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java index 3064af6f5170..71331dfcef44 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTaskOrganizer.java @@ -66,7 +66,6 @@ import com.android.wm.shell.ShellTaskOrganizer; import com.android.wm.shell.common.DisplayController; import com.android.wm.shell.common.ShellExecutor; import com.android.wm.shell.common.annotations.ShellMainThread; -import com.android.wm.shell.legacysplitscreen.LegacySplitScreen; import com.android.wm.shell.legacysplitscreen.LegacySplitScreenController; import com.android.wm.shell.pip.phone.PipMotionHelper; import com.android.wm.shell.transition.Transitions; @@ -585,6 +584,12 @@ public class PipTaskOrganizer implements ShellTaskOrganizer.TaskListener, } @Override + public boolean supportSizeCompatUI() { + // PIP doesn't support size compat. + return false; + } + + @Override public void onFixedRotationStarted(int displayId, int newRotation) { mNextRotation = newRotation; mWaitForFixedRotation = true; diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java index 653299326cd0..10c742b69578 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageTaskListener.java @@ -130,6 +130,17 @@ class StageTaskListener implements ShellTaskOrganizer.TaskListener { } } + @Override + public void attachChildSurfaceToTask(int taskId, SurfaceControl.Builder b) { + if (mRootTaskInfo.taskId == taskId) { + b.setParent(mRootLeash); + } else if (mChildrenLeashes.contains(taskId)) { + b.setParent(mChildrenLeashes.get(taskId)); + } else { + throw new IllegalArgumentException("There is no surface for taskId=" + taskId); + } + } + void setBounds(Rect bounds, WindowContainerTransaction wct) { wct.setBounds(mRootTaskInfo.token, bounds); } diff --git a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/ShellTaskOrganizerTests.java b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/ShellTaskOrganizerTests.java index 733e4845dd62..a0e9f43218f2 100644 --- a/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/ShellTaskOrganizerTests.java +++ b/libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/ShellTaskOrganizerTests.java @@ -106,11 +106,6 @@ public class ShellTaskOrganizerTests { public void onTaskVanished(RunningTaskInfo taskInfo) { vanished.add(taskInfo); } - - @Override - public boolean supportSizeCompatUI() { - return true; - } } @Before diff --git a/services/core/java/com/android/server/wm/ActivityRecord.java b/services/core/java/com/android/server/wm/ActivityRecord.java index f440e566d47e..9bf6df41a93b 100644 --- a/services/core/java/com/android/server/wm/ActivityRecord.java +++ b/services/core/java/com/android/server/wm/ActivityRecord.java @@ -5378,6 +5378,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A } } + mDisplayContent.handleActivitySizeCompatModeIfNeeded(this); mRootWindowContainer.ensureActivitiesVisible(null, 0, !PRESERVE_WINDOWS); } diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java index e51d690cabed..86968ed6d175 100644 --- a/services/core/java/com/android/server/wm/DisplayContent.java +++ b/services/core/java/com/android/server/wm/DisplayContent.java @@ -240,6 +240,7 @@ import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Objects; +import java.util.Set; import java.util.function.Consumer; import java.util.function.Predicate; @@ -663,12 +664,8 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp */ private boolean mRemoved; - /** - * Non-null if the last size compatibility mode activity is using non-native screen - * configuration. The activity is not able to put in multi-window mode, so it exists only one - * per display. - */ - private ActivityRecord mLastCompatModeActivity; + /** Set of activities in foreground size compat mode. */ + private Set<ActivityRecord> mActiveSizeCompatActivities = new ArraySet<>(); // Used in updating the display size private Point mTmpDisplaySize = new Point(); @@ -5553,24 +5550,23 @@ class DisplayContent extends RootDisplayArea implements WindowManagerPolicy.Disp /** Checks whether the given activity is in size compatibility mode and notifies the change. */ void handleActivitySizeCompatModeIfNeeded(ActivityRecord r) { final Task organizedTask = r.getOrganizedTask(); - if (!r.isState(RESUMED) || r.getWindowingMode() != WINDOWING_MODE_FULLSCREEN - || organizedTask == null) { - // The callback is only interested in the foreground changes of fullscreen activity. + if (organizedTask == null) { + mActiveSizeCompatActivities.remove(r); return; } - // TODO(b/178327644) Update for per Task size compat - if (!r.inSizeCompatMode()) { - if (mLastCompatModeActivity != null) { + + if (r.isState(RESUMED) && r.inSizeCompatMode()) { + if (mActiveSizeCompatActivities.add(r)) { + // Trigger task event for new size compat activity. organizedTask.onSizeCompatActivityChanged(); } - mLastCompatModeActivity = null; return; } - if (mLastCompatModeActivity == r) { - return; + + if (mActiveSizeCompatActivities.remove(r)) { + // Trigger task event for activity no longer in foreground size compat. + organizedTask.onSizeCompatActivityChanged(); } - mLastCompatModeActivity = r; - organizedTask.onSizeCompatActivityChanged(); } boolean isUidPresent(int uid) { diff --git a/services/core/java/com/android/server/wm/TaskOrganizerController.java b/services/core/java/com/android/server/wm/TaskOrganizerController.java index 286d31ed7d5f..c0bce6be8c54 100644 --- a/services/core/java/com/android/server/wm/TaskOrganizerController.java +++ b/services/core/java/com/android/server/wm/TaskOrganizerController.java @@ -674,7 +674,7 @@ class TaskOrganizerController extends ITaskOrganizerController.Stub { // Remove and add for re-ordering. mPendingTaskEvents.remove(pending); } - pending.mForce = force; + pending.mForce |= force; mPendingTaskEvents.add(pending); } diff --git a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java index cc4d4eaa9e8b..e843dd71381f 100644 --- a/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/SizeCompatTests.java @@ -482,8 +482,7 @@ public class SizeCompatTests extends WindowTestsBase { public void testHandleActivitySizeCompatModeChanged() { setUpDisplaySizeWithApp(1000, 2000); doReturn(true).when(mTask).isOrganized(); - ActivityRecord activity = mActivity; - activity.setState(Task.ActivityState.RESUMED, "testHandleActivitySizeCompatModeChanged"); + mActivity.setState(Task.ActivityState.RESUMED, "testHandleActivitySizeCompatModeChanged"); prepareUnresizable(mActivity, -1.f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT); assertFitted(); @@ -499,12 +498,12 @@ public class SizeCompatTests extends WindowTestsBase { // Make the activity resizable again by restarting it clearInvocations(mTask); - activity.info.resizeMode = RESIZE_MODE_RESIZEABLE; - activity.mVisibleRequested = true; - activity.restartProcessIfVisible(); + mActivity.info.resizeMode = RESIZE_MODE_RESIZEABLE; + mActivity.mVisibleRequested = true; + mActivity.restartProcessIfVisible(); // The full lifecycle isn't hooked up so manually set state to resumed - activity.setState(Task.ActivityState.RESUMED, "testHandleActivitySizeCompatModeChanged"); - mTask.mDisplayContent.handleActivitySizeCompatModeIfNeeded(activity); + mActivity.setState(Task.ActivityState.RESUMED, "testHandleActivitySizeCompatModeChanged"); + mTask.mDisplayContent.handleActivitySizeCompatModeIfNeeded(mActivity); // Expect null token when switching to non-size-compat mode activity. verify(mTask).onSizeCompatActivityChanged(); @@ -515,6 +514,46 @@ public class SizeCompatTests extends WindowTestsBase { } @Test + public void testHandleActivitySizeCompatModeChangedOnDifferentTask() { + setUpDisplaySizeWithApp(1000, 2000); + doReturn(true).when(mTask).isOrganized(); + mActivity.setState(Task.ActivityState.RESUMED, "testHandleActivitySizeCompatModeChanged"); + prepareUnresizable(mActivity, -1.f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT); + assertFitted(); + + // Resize the display so that the activity exercises size-compat mode. + resizeDisplay(mTask.mDisplayContent, 1000, 2500); + + // Expect the exact token when the activity is in size compatibility mode. + verify(mTask).onSizeCompatActivityChanged(); + ActivityManager.RunningTaskInfo taskInfo = mTask.getTaskInfo(); + + assertEquals(mActivity.appToken, taskInfo.topActivityToken); + assertTrue(taskInfo.topActivityInSizeCompat); + + // Create another Task to hold another size compat activity. + clearInvocations(mTask); + final Task secondTask = new TaskBuilder(mSupervisor).setDisplay(mTask.getDisplayContent()) + .setCreateActivity(true).build(); + final ActivityRecord secondActivity = secondTask.getTopNonFinishingActivity(); + doReturn(true).when(secondTask).isOrganized(); + secondActivity.setState(Task.ActivityState.RESUMED, + "testHandleActivitySizeCompatModeChanged"); + prepareUnresizable(secondActivity, -1.f /* maxAspect */, SCREEN_ORIENTATION_PORTRAIT); + + // Resize the display so that the activity exercises size-compat mode. + resizeDisplay(mTask.mDisplayContent, 1000, 3000); + + // Expect the exact token when the activity is in size compatibility mode. + verify(secondTask).onSizeCompatActivityChanged(); + verify(mTask, never()).onSizeCompatActivityChanged(); + taskInfo = secondTask.getTaskInfo(); + + assertEquals(secondActivity.appToken, taskInfo.topActivityToken); + assertTrue(taskInfo.topActivityInSizeCompat); + } + + @Test public void testShouldUseSizeCompatModeOnResizableTask() { setUpDisplaySizeWithApp(1000, 2500); |