Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[ATMS] Remove some dead code from Task" into tm-qpr-dev am: c893507c66

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18439362

Change-Id: Ia98be6d303d1597d58a5d8e8989c435dc0f08197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Garfield Tan
2022-05-18 16:59:39 +00:00
committed by Automerger Merge Worker
parent 16ca2957ed c893507c66
commit c25fb4f684
2 changed files with 1 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/Task.java
View File

@@ -2004,10 +2004,6 @@ class Task extends TaskFragment {
Rect outOverrideBounds = getResolvedOverrideConfiguration().windowConfiguration.getBounds(); Rect outOverrideBounds = getResolvedOverrideConfiguration().windowConfiguration.getBounds();
if (windowingMode == WINDOWING_MODE_FULLSCREEN) { if (windowingMode == WINDOWING_MODE_FULLSCREEN) {
if (!isOrganized()) {
// Use empty bounds to indicate "fill parent".
outOverrideBounds.setEmpty();
}
// The bounds for fullscreen mode shouldn't be adjusted by minimal size. Otherwise if // The bounds for fullscreen mode shouldn't be adjusted by minimal size. Otherwise if
// the parent or display is smaller than the size, the content may be cropped. // the parent or display is smaller than the size, the content may be cropped.
return; return;

29
services/tests/wmtests/src/com/android/server/wm/TaskTests.java
View File

@@ -496,34 +496,6 @@ public class TaskTests extends WindowTestsBase {
assertEquals(reqBounds.height(), task.getBounds().height()); assertEquals(reqBounds.height(), task.getBounds().height());
} }
/** Tests that the task bounds adjust properly to changes between FULLSCREEN and FREEFORM */
@Test
public void testBoundsOnModeChangeFreeformToFullscreen() {
DisplayContent display = mAtm.mRootWindowContainer.getDefaultDisplay();
Task rootTask = new TaskBuilder(mSupervisor).setDisplay(display).setCreateActivity(true)
.setWindowingMode(WINDOWING_MODE_FREEFORM).build();
Task task = rootTask.getBottomMostTask();
task.getRootActivity().setOrientation(SCREEN_ORIENTATION_UNSPECIFIED);
DisplayInfo info = new DisplayInfo();
display.mDisplay.getDisplayInfo(info);
final Rect fullScreenBounds = new Rect(0, 0, info.logicalWidth, info.logicalHeight);
final Rect freeformBounds = new Rect(fullScreenBounds);
freeformBounds.inset((int) (freeformBounds.width() * 0.2),
(int) (freeformBounds.height() * 0.2));
task.setBounds(freeformBounds);
assertEquals(freeformBounds, task.getBounds());
// FULLSCREEN inherits bounds
rootTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
assertEquals(fullScreenBounds, task.getBounds());
assertEquals(freeformBounds, task.mLastNonFullscreenBounds);
// FREEFORM restores bounds
rootTask.setWindowingMode(WINDOWING_MODE_FREEFORM);
assertEquals(freeformBounds, task.getBounds());
}
/** /**
* Tests that a task with forced orientation has orientation-consistent bounds within the * Tests that a task with forced orientation has orientation-consistent bounds within the
* parent. * parent.
@@ -589,6 +561,7 @@ public class TaskTests extends WindowTestsBase {
// FULLSCREEN letterboxes bounds on activity level, no constraint on task level. // FULLSCREEN letterboxes bounds on activity level, no constraint on task level.
rootTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN); rootTask.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
rootTask.setBounds(null);
assertThat(task.getBounds().height()).isGreaterThan(task.getBounds().width()); assertThat(task.getBounds().height()).isGreaterThan(task.getBounds().width());
assertThat(top.getBounds().width()).isGreaterThan(top.getBounds().height()); assertThat(top.getBounds().width()).isGreaterThan(top.getBounds().height());
assertEquals(fullScreenBoundsPort, task.getBounds()); assertEquals(fullScreenBoundsPort, task.getBounds());