From 62b3f1aa39d4c1547cf7f8825a79b46df65d8ce5 Mon Sep 17 00:00:00 2001 From: Chris Li Date: Fri, 7 Oct 2022 21:58:52 +0800 Subject: [PATCH] Fix TransitionTests#testFlagFillsTask_openActivityFillingTask Make sure the Task bounds is set correctly. Fix: 250094641 Test: atest WmTests:TransitionTests Change-Id: I7ef5c47625ab1c17dcab336057c93b243688022e --- .../src/com/android/server/wm/TransitionTests.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java index 45d8e226c64f2..d07ddec177dd4 100644 --- a/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java +++ b/services/tests/wmtests/src/com/android/server/wm/TransitionTests.java @@ -19,7 +19,6 @@ package com.android.server.wm; import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD; import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN; -import static android.app.WindowConfiguration.WINDOWING_MODE_MULTI_WINDOW; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_NOSENSOR; import static android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSET; import static android.view.WindowManager.LayoutParams.ROTATION_ANIMATION_SEAMLESS; @@ -1160,10 +1159,8 @@ public class TransitionTests extends WindowTestsBase { final ArraySet participants = transition.mParticipants; final Task task = createTask(mDisplayContent); - // Set to multi-windowing mode in order to set bounds. - task.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW); final Rect taskBounds = new Rect(0, 0, 500, 1000); - task.setBounds(taskBounds); + task.getConfiguration().windowConfiguration.setBounds(taskBounds); final ActivityRecord nonEmbeddedActivity = createActivityRecord(task); final TaskFragmentOrganizer organizer = new TaskFragmentOrganizer(Runnable::run); mAtm.mTaskFragmentOrganizerController.registerOrganizer( @@ -1205,10 +1202,8 @@ public class TransitionTests extends WindowTestsBase { final ArraySet participants = transition.mParticipants; final Task task = createTask(mDisplayContent); - // Set to multi-windowing mode in order to set bounds. - task.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW); final Rect taskBounds = new Rect(0, 0, 500, 1000); - task.setBounds(taskBounds); + task.getConfiguration().windowConfiguration.setBounds(taskBounds); final ActivityRecord activity = createActivityRecord(task); // Start states: set bounds to make sure the start bounds is ignored if it is not visible. activity.getConfiguration().windowConfiguration.setBounds(new Rect(0, 0, 250, 500)); @@ -1236,10 +1231,8 @@ public class TransitionTests extends WindowTestsBase { final ArraySet participants = transition.mParticipants; final Task task = createTask(mDisplayContent); - // Set to multi-windowing mode in order to set bounds. - task.setWindowingMode(WINDOWING_MODE_MULTI_WINDOW); final Rect taskBounds = new Rect(0, 0, 500, 1000); - task.setBounds(taskBounds); + task.getConfiguration().windowConfiguration.setBounds(taskBounds); final ActivityRecord activity = createActivityRecord(task); // Start states: fills Task without override. activity.mVisibleRequested = true;