Commit Graph

1548 Commits

Author SHA1 Message Date
HQ Liu
8b1ac07acf Merge "Use RootTaskDisplayAreaOrganizer to change windowing mode" into tm-qpr-dev am: 51afb38bda am: 83fe86c44b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19931405

Change-Id: I3b68b318c2382f845b3e1974a6865b2a1c9977cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:39:51 +00:00
HQ Liu
51afb38bda Merge "Use RootTaskDisplayAreaOrganizer to change windowing mode" into tm-qpr-dev 2022-09-20 19:43:33 +00:00
Chilun Huang
8ad555c1dd Merge "Move unstable tests to postsubmit" 2022-09-19 23:54:47 +00:00
Pablo Gamito
5c04ae0b84 Merge "Update PiP region movement logic" 2022-09-19 16:50:46 +00:00
Chilun Huang
0a0f3d3b16 Move unstable tests to postsubmit
Move unstable tests to postsubmit.

Bug: 225582520
Bug: 245472831
Bug: 246490534
Test: atest com.android.wm.shell.flicker.splitscreen
Change-Id: Iec08a185c5e95f4810b962989ab22b67d71a2f82
2022-09-20 00:26:03 +08:00
Pablo Gamito
520f0183b6 Merge "Fix PiP Flicker test transitions" 2022-09-19 14:17:03 +00:00
Pablo Gamito
6ae3883e86 Update PiP region movement logic
We want the assertion to be stricter and ensure we actually assert that the region is moving and fail if it doesn't move.

Test: atest FlickerTests WmShellFlickerTests
Bug: 247464794
Change-Id: I81eba3a61f4e999fc46b3a567db39d1d9a4e469b
2022-09-19 12:20:44 +00:00
Pablo Gamito
c35d359131 Fix PiP Flicker test transitions
Ensures we don't have no-op transitions anymore. Another change makes it
so we assert and fail if we have transitions we no entries to make sure
we don't fail silenetly in these cases.

Test: atest FlickerTests WmShellFlickerTests
Bug: 247464790
Change-Id: Iaad739c4bb869c51c6deee582ae5ff9c81013ea2
2022-09-19 09:09:00 +00:00
Ats Jenk
6ebcc11a1a Merge "Move active task tracking to a repository" into tm-qpr-dev am: 0a0969af1c am: d9d37cf01d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969528

Change-Id: Ie6c6f645a53068bea0f4678908d30a7518dd154d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 13:00:14 +00:00
Evan Rosky
ef854fbdb9 Merge "Use transition for desktop-mode switch when enabled" into tm-qpr-dev am: d6c6f5865f am: ddf207959e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19973186

Change-Id: I2f3596acc2bcbd4cf94eb58750ddb5fe4cbb1d66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:47:32 +00:00
Ats Jenk
0a0969af1c Merge "Move active task tracking to a repository" into tm-qpr-dev 2022-09-17 00:16:33 +00:00
HQ Liu
e4ef661839 Use RootTaskDisplayAreaOrganizer to change windowing mode
In core, windowing mode is being set in TDA with ag/19902621. Thus, set
windowing mode with RooTaskDisplayAreaOrganizer instead of
RootDisplayAreaOrganizer.

Bug: b/241168290
Test: services/tests/wmtests
Change-Id: Ib7e6701839f83ab4125a9630d20203f8c5e415ba
2022-09-16 16:09:54 -07:00
Ats Jenk
8a3cf44c9a Move active task tracking to a repository
We were tracking active freeform tasks in the RecentTasksController.
This causes some issues when we want to share that information to other
controllers like DesktopModeController.
Move tracking of active tasks to a separate repository that controllers
can query and listen for updates.

Bug: 244348395
Test: atest DesktopModeTaskRepositoryTest RecentTasksControllerTest
Change-Id: I7a460020f6b2133225e292a04f29ae1dd27e964b
2022-09-16 13:51:42 -07:00
Evan Rosky
d6c6f5865f Merge "Use transition for desktop-mode switch when enabled" into tm-qpr-dev 2022-09-16 16:38:27 +00:00
Jerry Chang
54b3167fbb Merge "Fix timeout when dismissing split screen to two pane mode" into tm-qpr-dev am: b48c123b67 am: 0f30697436
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947800

Change-Id: Ia491efa508e29fa20f52ea3d88f744f1130ad02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 01:47:19 +00:00
Chris Li
d46a1bdc9c Merge "Only play ActivityEmbedding animation if there is AE split" into tm-qpr-dev am: 7eb3933a3e am: e4d6e029d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949790

Change-Id: I314af442724fe9d14801250b4979ba9879ba6c42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 01:33:18 +00:00
Chris Li
8696c045ca Merge "Play ActivityEmbedding animation if all changes in Task with embedded" into tm-qpr-dev am: 941a2e72f6 am: a5c9cd1525
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19851630

Change-Id: I25a90caac1ccd33404094ce4b0b4203fe87bec5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 01:29:37 +00:00
Jerry Chang
b48c123b67 Merge "Fix timeout when dismissing split screen to two pane mode" into tm-qpr-dev 2022-09-16 00:51:43 +00:00
Evan Rosky
6a1363adc8 Use transition for desktop-mode switch when enabled
WHen using shell-transitions, use a transition instead of
regular applyTransaction

Bug: 236047261
Test: use desktop-mode switch w/ shell-transit. observe an actual
      transition.
Change-Id: I81f37d278420383f8b2b0f37cca8a398313705cb
2022-09-16 00:26:59 +00:00
Chris Li
7eb3933a3e Merge "Only play ActivityEmbedding animation if there is AE split" into tm-qpr-dev 2022-09-15 23:31:24 +00:00
Chris Li
941a2e72f6 Merge "Play ActivityEmbedding animation if all changes in Task with embedded" into tm-qpr-dev 2022-09-15 23:31:09 +00:00
Chris Li
b74873a410 Only play ActivityEmbedding animation if there is AE split
Same as the legacy app transition, we want to play the app customized
animation if there is no AE split.

We don't support app customized animation when there is AE split yet to
make the animation consistant.

Bug: 207070762
Test: atest WMShellUnitTests:ActivityEmbeddingControllerTests
Test: atest WmTests:TransitionTests
Change-Id: I68348cd650b9dbc8c39ef8d22a171d128e196882
2022-09-15 06:31:01 +00:00
Chris Li
1efadcb97c Play ActivityEmbedding animation if all changes in Task with embedded
Same as the legacy app transition, we want to play AE animation if all
changes are in Task with embedded activity

Bug: 207070762
Test: atest WmTests:TransitionTests
Change-Id: I66c5c083a517b3254d647c7335264eba8837f0cd
2022-09-15 06:30:05 +00:00
Jerry Chang
d65119ec02 Fix timeout when dismissing split screen to two pane mode
After I1a0c4d17, the expanding task will first be resized to fullscreen
then reparent to TDA after the divider bar fling animation finished. If
the expanding app is expanding to two pane mode, the resuming of the
second activity might be skpped due to the task in another side of the
split is already empty and invisible.

Update the drag-to-dismiss flow to reorder the expanding task on the top
of dismissing task. So the content in the dismissing side won't flicker
during the dismissing transition and the activity resume won't be
skipped in the expanding side.

Fix: 243368173
Test: atest WMShellFlickerTests
Test: atest WMShellUnitTests
Test: put Settings and Chrome in split screen,
      drag divider bar to dismiss Chrome,
      verified the expanding transition won't timeout
Change-Id: Id16c1d9b4849d5f600de9524ffebb91aba73a721
2022-09-15 03:24:17 +00:00
Ikram Gabiyev
c3afed91da Merge "Allow pip screen size to toggle on double tap" into tm-qpr-dev am: 491e471def am: f9a13d3ef9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19906482

Change-Id: I4ae249aa64b3c357611ac9731b2a11067da289ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-14 20:51:32 +00:00
Pablo Gamito
ea34fde7f9 Merge changes I98fce6ec,I04c3eb15
* changes:
  Promote stable Flicker tests
  Add isTablet assumption to navBarLayerIsInvisibleInLandscapeGestural
2022-09-14 11:36:19 +00:00
Ikram Gabiyev
2dc6275e3a Allow pip screen size to toggle on double tap
Make sure pip screen size animates to normal
or maximum size depending on the current width
when a double tap occurs

Test: manually reproduced steps in the bug listed
Test: atest WMShellUnitTests:PipDoubleTapHelperTest
Test: atest WMShellFlickerTests:ExpandPipOnDoubleClickTest

Bug: 232173973
Change-Id: Ia8ec8696fddd236f992803451f44457e974069ac
2022-09-13 20:16:46 +00:00
Pablo Gamito
45b62d4bc3 Promote stable Flicker tests
Test: atest FlickerLibTest WMShellFlickerTest
Change-Id: I98fce6ecc2626df436eae69d2d759e13e3fc0cc1
2022-09-13 16:20:21 +00:00
Chilun Huang
2b70e5f20e Merge "Only apply ironwood-postsubmit annotation to stable tests" 2022-09-13 02:14:34 +00:00
Chilun Huang
f32425e41b Merge "Update enter split-screen flicker tests" 2022-09-13 02:12:34 +00:00
Hongwei Wang
11eb36a067 Merge "Update PiP movement bounds on TaskBar inset change" into tm-qpr-dev am: f121693b9d am: 52887966f8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19904559

Change-Id: I6ddd4042963c3eeb044038d95297199aa8d9c913
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-12 19:59:21 +00:00
Hongwei Wang
f121693b9d Merge "Update PiP movement bounds on TaskBar inset change" into tm-qpr-dev 2022-09-12 18:02:43 +00:00
Chilun Huang
d87b6f05d8 Update enter split-screen flicker tests
Use 'or' transition for notContains and isInvisible.

Update the validation of app layer to match the current transition.

Bug: 244414379
Test: atest com.android.wm.shell.flicker.splitscreen

Change-Id: I13dcbd702b81ba75258083523f89e4505f481cf4
2022-09-12 20:14:37 +08:00
Pablo Gamito
54b16b092b Merge "Remove distinction between test and transition setup/teardown" 2022-09-12 07:53:15 +00:00
Chilun Huang
9413f6eba2 Only apply ironwood-postsubmit annotation to stable tests
Only apply @IwTest to those tests with @Presubmit.

Bug: 225582520
Bug: 245722917
Test: atest --test-mapping
frameworks/base/libs/WindowManager/Shell/src/com/android/wm/shell:ironwood-postsubmit

Change-Id: I63b8384bcdc2a0c5715eae11150ef34e3b67032d
2022-09-12 14:55:59 +08:00
Chilun Huang
b234ca2f08 Merge "Fix tests for changed transitions" 2022-09-12 02:36:59 +00:00
Hongwei Wang
f6fda1770a Update PiP movement bounds on TaskBar inset change
The DisplayLayout#stableInsets was set according to navigation bar
height and not get updated when TaskBar becomes visible.

Video: http://recall/-/aaaaaabFQoRHlzixHdtY/dPuTSbBuAgjfyKiliwzo2Q
Bug: 198644965
Test: Open another app with PiP present and move it around, see Video
Test: atest WMShellUnitTests:PipControllerTest
Change-Id: I4db1446de0cb257e26d34985d294908cfe692967
2022-09-09 14:31:50 -07:00
Ats Jenk
c6dc83aa7f Merge "Add unit test for GroupedRecentTaskInfo" into tm-qpr-dev am: 39e0f9f958 am: 20bc269d8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19904018

Change-Id: I1a144052d589c6b5874bd498badf93a134ca0080
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-09 19:11:15 +00:00
Ats Jenk
39e0f9f958 Merge "Add unit test for GroupedRecentTaskInfo" into tm-qpr-dev 2022-09-09 18:30:53 +00:00
Pablo Gamito
3e1c663168 Remove distinction between test and transition setup/teardown
Bug: 244279812

Test: atest FlickerLibTest
Change-Id: Ic1f0acbbd3fee1db7b25b3fed5257447442b2487
2022-09-09 15:51:15 +00:00
Ivan Makarov
bd8d6fc437 Merge "Move SplitscreenEventLogger to StageCoordinator" into tm-qpr-dev 2022-09-09 11:36:05 +00:00
Ivan Makarov
8ac0ae76e0 Move SplitscreenEventLogger to StageCoordinator
Currently, the SplitscreenEventLogger is declared as private final and
initialized in constructor of the SplitScreenController and not used
anywhere else in the SplitScreenController. Moved the initialization to
the StageCoordinator and removed the field from SplitScreenController.

Bug: 245650570
Test: atest SplitTransitionTests
Test: atest SplitScreenControllerTests
Test: atest StageCoordinatorTests

Change-Id: Iedc8893982f3bc4ba4c41f6a394f5fdf39098a99
Merged-In: Iedc8893982f3bc4ba4c41f6a394f5fdf39098a99
2022-09-09 09:51:09 +00:00
Ivan Makarov
29f7983f73 Merge "Move SplitscreenEventLogger to StageCoordinator" 2022-09-09 08:35:28 +00:00
Ats Jenk
c3e38f4ae4 Add unit test for GroupedRecentTaskInfo
Add unit tests for creating GroupedRecentTaskInfo objects and the
parcelling logic.

Bug: 244348395
Test: atest GroupedRecentTaskInfoTest
Change-Id: I10c97e91f164a45c3ed17935a820c5ed168e8305
2022-09-08 20:48:52 +00:00
Ats Jenk
37f08f0f8e Merge "Track active freeform tasks" into tm-qpr-dev am: be367cdd51 am: b636da0350
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19816904

Change-Id: I8506cc4486617ccbe2b319044ada044615c34418
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-08 16:43:03 +00:00
Chilun Huang
91a9a9b35c Fix tests for changed transitions
Fix tests according to new entering/dismissing transitions.

Bug: 244414379
Test: atest com.android.wm.shell.flicker.splitscreen

Change-Id: I02046eb4748ed34fac6b5caaac39bcf82dc33e46
2022-09-08 19:54:02 +08:00
Chilun Huang
f2eba4edcc Merge "Add ironwood-postsubmit annotation" 2022-09-08 10:11:02 +00:00
Ivan Makarov
c6dd395692 Move SplitscreenEventLogger to StageCoordinator
Currently, the SplitscreenEventLogger is declared as private final and
initialized in constructor of the SplitScreenController and not used
anywhere else in the SplitScreenController. Moved the initialization to
the StageCoordinator and removed the field from SplitScreenController.

Bug: 245650570
Test: atest SplitTransitionTests
Test: atest SplitScreenControllerTests
Test: atest StageCoordinatorTests

Change-Id: Iedc8893982f3bc4ba4c41f6a394f5fdf39098a99
2022-09-08 09:08:20 +00:00
Ats Jenk
b092c78a7a Track active freeform tasks
Track active freeform tasks and filter them from recent tasks in overview if
desktop mode is active.
A task is considered an active freeform task if it meets the following criteria:
- task is running
- task has been visible at least once when desktop mode was on

Bug: 244348395
Test: atest RecentTasksControllerTest
Change-Id: I10854b467615fc5bb257c1719d3887643d28fd52
2022-09-07 15:24:57 -07:00
Ats Jenk
c19a095d60 Merge "Only clear bounds and windowing mode for standard" into tm-qpr-dev am: 70a463df5c am: 0d5367cd2c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19831646

Change-Id: I8607ad90d4080741f610b47b1e96dc73178b5496
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-06 17:11:01 +00:00