summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Hongwei Wang <hwwang@google.com> 2019-12-26 14:54:55 -0800
committer Hongwei Wang <hwwang@google.com> 2019-12-26 15:56:18 -0800
commit47c14f41df4c0bbe5c77c09cf6585834b4386980 (patch)
treeace2f5bf5c0c88961c0aac35ea09469e0ae4205c
parentb1575f6a52bf011ee413574c739435048b2030c1 (diff)
Allow resize for secondary split screen
We use to resize the stack whenever there is new override bounds and accidentally make that for primary split screen only in ag/9720001 Bug: 146879048 Test: atest PinnedStackTests Test: atest ActivityLifecyclePipTests.testSplitScreenBelowPip Test: atest ActivityLifecycleSplitScreenTests.testResumedWhenRecreatedFromInNonFocusedStack Test: atest ActivityLifecycleSplitScreenTests.testOccludingMovedBetweenStacks Change-Id: If9cfe76c79e054cc10288ae3b955478e80a2ce92
-rw-r--r--services/core/java/com/android/server/wm/ActivityStack.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/wm/ActivityStack.java b/services/core/java/com/android/server/wm/ActivityStack.java
index 62dd7bb85df5..70117baaeec5 100644
--- a/services/core/java/com/android/server/wm/ActivityStack.java
+++ b/services/core/java/com/android/server/wm/ActivityStack.java
@@ -879,6 +879,10 @@ class ActivityStack extends WindowContainer<WindowContainer> implements BoundsAn
null /* tempTaskBounds */, null /* tempTaskInsetBounds */,
null /* tempOtherTaskBounds */, null /* tempOtherTaskInsetBounds */,
PRESERVE_WINDOWS, true /* deferResume */);
+ } else if (overrideWindowingMode != WINDOWING_MODE_PINNED) {
+ // For pinned stack, resize is now part of the {@link WindowContainerTransaction}
+ resize(new Rect(newBounds), null /* tempTaskBounds */,
+ null /* tempTaskInsetBounds */, PRESERVE_WINDOWS, true /* deferResume */);
}
}
if (prevIsAlwaysOnTop != isAlwaysOnTop()) {