Jerry Chang
8193e19665
Merge "Fix not able to launch multi-instance with drag and drop gesture" into tm-qpr-dev am: 5e5d3a1544 am: f72b89e11e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18670839
Change-Id: I9526e46d170c5056e7907d60a58dd424ef74efb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-08 02:34:11 +00:00
Jerry Chang
5e5d3a1544
Merge "Fix not able to launch multi-instance with drag and drop gesture" into tm-qpr-dev
2022-06-08 01:37:16 +00:00
Vinit Nayak
c4f68728d0
Merge "Rename split classes/variables for consistency" into tm-qpr-dev am: 422f1d8b4e am: 21dceecca3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18639323
Change-Id: Ieb75e7cd64d9742bca9500968b5657884a377bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 23:03:32 +00:00
Vinit Nayak
422f1d8b4e
Merge "Rename split classes/variables for consistency" into tm-qpr-dev
2022-06-07 22:36:47 +00:00
Pablo Gamito
93a3db084b
Update Flaky annotation
...
We will now only support the annotation for flaky flicker tests so we need to update all tests that still use the to use that.
Bug: 233876784
Test: atest FlickerTests
Change-Id: Ib693a64c1367c17b4644247dd51c6c2c15de15e6
2022-06-07 19:20:21 +00:00
Luis Delgado De Mendoza Garcia
5283b37352
Merge "Revert "Migrate unfold animation to Shell transitions [Part 3]"" into tm-qpr-dev am: 3b628d7c69 am: 2aa66b19de
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18763192
Change-Id: I5c36a1a14f56f6bb0f5f04d022a695d873ffc1be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-07 01:56:55 +00:00
Luis Delgado De Mendoza Garcia
3b628d7c69
Merge "Revert "Migrate unfold animation to Shell transitions [Part 3]"" into tm-qpr-dev
2022-06-07 01:19:45 +00:00
Mady Mellor
b4b5a0bc95
Merge "Fix an issue where the pointer could be invisible" into tm-qpr-dev am: 9f5ed9f3e7 am: 2113816423
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18717983
Change-Id: I13a0bd1c4a4aa4eb8a5678971ac1e8b5a2ef1d4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 23:44:34 +00:00
Vinit Nayak
5fc5261a8e
Rename split classes/variables for consistency
...
Fixes: 233006032
Change-Id: I7c1627b05b93999d08ee4a89c1498ac91021c5b0
2022-06-06 16:33:47 -07:00
Mady Mellor
9f5ed9f3e7
Merge "Fix an issue where the pointer could be invisible" into tm-qpr-dev
2022-06-06 23:21:32 +00:00
Luis Delgado De Mendoza Garcia
2a7f7b919a
Revert "Migrate unfold animation to Shell transitions [Part 3]"
...
Revert "Update TaskListener constructors to match the upstream"
Revert submission 18628270-unfold-shell-p3
Reason for revert: b/235090315
Reverted Changes:
Ibe684471a:Migrate unfold animation to Shell transitions [Par...
I7bd398c96:Update TaskListener constructors to match the upst...
I7bd398c96:Migrate unfold animation to Shell transitions [Par...
Bug: 235090315
Change-Id: I8639d618131c09f7a5f0c776fb02c426b78b1fdd
2022-06-06 21:13:07 +00:00
Mady Mellor
25fdf10ad1
Fix an issue where the pointer could be invisible
...
Add setBackgroundAlpha and use that to change the alpha of the
expanded view background and pointer.
Test: manual - have a bunch of bubbles, expand them, dismiss the
selected one
=> verify that the arrow is visible for the next bubble
- turn on home animation, swipe up to collapse a bubble
=> verify pointer looks fine
Bug: 234739591
Change-Id: If5823840d148e2031312c54eba9c0132b8aa3a4c
2022-06-06 12:20:27 -07:00
Nick Chameyev
9175ed2d13
Merge "Migrate unfold animation to Shell transitions [Part 3]" into tm-qpr-dev am: cd6eac332c am: 197b57659b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17822143
Change-Id: Icca2f23d5c17be10d39617d098c2358825838fb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-06 10:05:03 +00:00
Nick Chameyev
cd6eac332c
Merge "Migrate unfold animation to Shell transitions [Part 3]" into tm-qpr-dev
2022-06-06 09:33:10 +00:00
Mateusz Cicheński
a499dd3aea
Merge "Add a flicker test for entering PiP via navigation to Home" into tm-qpr-dev am: e86b8edc91 am: eed44f04ab
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18674913
Change-Id: I9d373da3bed84a124c2124d37bb923e9bce20543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-02 21:16:09 +00:00
Mateusz Cicheński
e86b8edc91
Merge "Add a flicker test for entering PiP via navigation to Home" into tm-qpr-dev
2022-06-02 20:40:28 +00:00
TreeHugger Robot
a2b06b0dc3
Merge "Add developer option for back animation"
2022-06-02 05:13:29 +00:00
Mateusz Cicheński
25cfccaaa0
Add a flicker test for entering PiP via navigation to Home
...
Bug: 216577639
Test: atest WMShellFlickerTests:EnterPipOnUserLeaveHintTest
Change-Id: I59448191a22c31e4591346de58695ff653e3687f
2022-06-01 17:27:20 +00:00
Jerry Chang
f62fecc458
Fix not able to launch multi-instance with drag and drop gesture
...
There are apps using alias activity name, result to wm-shell not able to
determine whether it's launching the same component or not. Update to
check the component name in the intent that created the task instead to
prevent affected by alias component name.
Fix: 224901460
Fix: 234304765
Fix: 233922245
Fix: 233174334
Fix: 232034346
Test: atest WMShellUnitTests
Test: manual check drag to launch multi-instance or drag to switch
split position with reported apps work
Change-Id: I924120134bb3ce6abe582251e3afdc7a0825a6a5
2022-06-01 08:32:50 +00:00
TreeHugger Robot
bbbf15356e
Merge "Modify app expected position base on the drag behavior change" into tm-qpr-dev am: 70c1287127 am: 931bc49c5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18607132
Change-Id: If4e852e90d9dcbf71fa1bd9e4fe0ff795d58038e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-28 00:11:55 +00:00
Mateusz Cicheński
219541fa2e
Merge "Add keep clear area avoidance algorithm for PiP" into tm-qpr-dev am: 2542f63ded am: 71f34acd50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18606022
Change-Id: I1d23127beea0cc3222c52b28f3fd56ddb8e74903
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 23:35:00 +00:00
TreeHugger Robot
70c1287127
Merge "Modify app expected position base on the drag behavior change" into tm-qpr-dev
2022-05-27 21:39:24 +00:00
Mateusz Cicheński
2542f63ded
Merge "Add keep clear area avoidance algorithm for PiP" into tm-qpr-dev
2022-05-27 19:53:42 +00:00
Chilun Huang
31b85ddad7
Modify app expected position base on the drag behavior change
...
Because ag/18529596 change the drop position, the test need to modify
the expected position of the app.
Bug: 232878493
Test: atest EnterSplitScreenByDragFromAllApps
Change-Id: Ib4823a899aa42ab2c0b23f9e654cbf13becb02bd
2022-05-28 02:24:33 +08:00
Nick Chameyev
181024c157
Migrate unfold animation to Shell transitions [Part 3]
...
Adds real unfold animation for split-screen tasks when
doing the Shell unfold transition.
The approach is similar to full-screen tasks:
we animate the surfaces using shell transition
only when unfolding, when folding we are doing
it in the old way (by directly accessing
the surfaces from TaskOrganizer).
Refactored the previous fullscreen/splitscreen unfold
controllers flow to have one controller where we can
register diferrent 'animators'. This controller listens
to all task events in the shell task organizer.
Bug: 204925795
Test: folding/unfolding, rotating with a split layout
when Shell transitions enabled/disabled,
rotating display when folded/unfolded
Change-Id: I7bd398c963125ceb7c8f8e3786a274853366feb3
2022-05-27 13:54:00 +00:00
TreeHugger Robot
f19d7835e3
Merge "Add assertions for layers become visible" into tm-qpr-dev am: e4d77e2522 am: c5129bf966
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18580724
Change-Id: I805292ea288d2bb33dad9652f83f42cf5c3432f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 07:35:25 +00:00
TreeHugger Robot
e4d77e2522
Merge "Add assertions for layers become visible" into tm-qpr-dev
2022-05-26 05:56:07 +00:00
Mateusz Cicheński
407ea1ad4f
Add keep clear area avoidance algorithm for PiP
...
The algorithm computes a new position for PiP based on the registered
keep clear areas within the system. If no occlusion happens the original
position is being returned. Otherwise, the bounds are moved in one of the
available directions so that none of the keep clear areas are occluded
while keeping PiP within the display bounds.
Test: atest PipKeepClearAlgorithmTest
Bug: 183746978
Change-Id: Ic2d11861329a46e2da0448f90283f67f6e7125d7
2022-05-25 23:01:54 +00:00
Vadim Caen
0cfb931532
Add developer option for back animation
...
Bug: 228936326
Test: BackAnimationControllerTest#animationDisabledFromSettings
Change-Id: I857a480e7375cada9171712d737162c7876c087e
Merged-In: I857a480e7375cada9171712d737162c7876c087e
2022-05-25 09:57:36 +00:00
Chilun Huang
6384389786
Add assertions for layers become visible
...
Add more assertions for layers become visible.
Bug: 232878493
Test: atest EnterSplitScreenByDragFromAllApps
Change-Id: Ida948525b618b800915813cf2927523600e23724
2022-05-25 15:07:28 +08:00
Vadim Caen
21421cd776
DO NOT MERGE Only rely on developer option for back animation am: ab58191c7f am: 1d83999ad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310267
Change-Id: I59cdc9e93cce4e8b7cbeaea5f0816d5a78a7d7de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:34:50 +00:00
Vadim Caen
1d83999ad0
DO NOT MERGE Only rely on developer option for back animation am: ab58191c7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18310267
Change-Id: I150be6a4fae771ffe6e841806772aa2218ae871b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:00 +00:00
Vadim Caen
ab58191c7f
DO NOT MERGE Only rely on developer option for back animation
...
BackNavigationController was still relying on a debug setting. Now the
animation request is handled via a boolean parameter passed by sysui,
which has access to the developer option.
Test: Existing test modified
Bug: 231502692
Change-Id: Icda4692e05396407d961610de0ce709492adadc1
Merged-In: Icda4692e05396407d961610de0ce709492adadc1
2022-05-23 10:43:04 +00:00
TreeHugger Robot
acada0cc03
Merge "Create flicker tests for split screen" into tm-qpr-dev am: 611e9ca2fa am: 61a617d21a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18408288
Change-Id: Ia57565f1523def1103ec2137c93cbec3ba1172b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 08:16:29 +00:00
TreeHugger Robot
611e9ca2fa
Merge "Create flicker tests for split screen" into tm-qpr-dev
2022-05-19 03:50:07 +00:00
Ben Lin
499b1971a7
Merge "Apply PiP Params if there was a deferred info." into tm-dev am: 26b096d288 am: 2bbd40e21b am: 8f049afdf4 am: cff49c498e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18380631
Change-Id: I26f9ff82962a58fc6ef21accbd1ab74a85421d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-19 02:24:13 +00:00
Ben Lin
8f049afdf4
Merge "Apply PiP Params if there was a deferred info." into tm-dev am: 26b096d288 am: 2bbd40e21b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18380631
Change-Id: I260e95b48c681eb89929b05421286f5cdd8f66fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:48:20 +00:00
Mady Mellor
f75c5bbd21
Merge "Fix potential NPE & clean up some logic" into tm-dev am: 5126e8b1b5 am: bd906a04f1 am: 8fcb27714a am: eee48a1e08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18421368
Change-Id: I061a9d76d7fc4af0d15457921d8bb253981bcb1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:18:05 +00:00
Mady Mellor
4e4780bef5
Merge "Fix potential NPE & clean up some logic" into tm-dev am: 5126e8b1b5 am: 7d2923a911
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18421368
Change-Id: I9436983ccb31fcefcb82b68bdf6178274f6f4091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:01:56 +00:00
Alex Johnston
00090b1d4a
Merge "Add background protection when work biometrics is shown" into tm-dev am: ed00c662dc am: 9eeb0112fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351382
Change-Id: Ic48ca6f44aabcb4cc02ac03dc656603f8e8a3c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 22:00:03 +00:00
Mady Mellor
2a40a813db
Merge "When a user is removed make sure we remove their persisted bubbles" into tm-dev am: f0f1105de7 am: dd7397e3d5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18153123
Change-Id: Ia9cb0ff9d31de4ba8d5fbc1d2227319ad45eeb4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:54:49 +00:00
Shan Huang
f0712948d3
Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 am: 8efc556da6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18407083
Change-Id: I24b15d7581da7864681a10dfc4b1a6cdfeb591f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:53:10 +00:00
Shan Huang
87370813e4
Merge "Fix broken animation on two consecutive swipes." into tm-dev am: 8a91edd4a3 am: 1d57848828
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17963879
Change-Id: Iebe3b12e42187ca004384938826f489aba5565b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:49:44 +00:00
Mady Mellor
eee48a1e08
Merge "Fix potential NPE & clean up some logic" into tm-dev am: 5126e8b1b5 am: bd906a04f1 am: 8fcb27714a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18421368
Change-Id: I5e7c2c61c3b6bb3ac89e2de073df85b0cc6b2f29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:33:29 +00:00
Alex Johnston
aba45cbf86
Merge "Add background protection when work biometrics is shown" into tm-dev am: ed00c662dc am: 8ee9805298 am: 625d65d4d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18351382
Change-Id: Ia6660e9fdb4ff2e31d2bbce91ab0eda2b79a1afa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:12:13 +00:00
Mady Mellor
f2b80585d0
Merge "When a user is removed make sure we remove their persisted bubbles" into tm-dev am: f0f1105de7 am: c6b3c54c70 am: c554105e70
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18153123
Change-Id: Iaa907cda11acb9af46765443ece4adba59d7a6a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:07:21 +00:00
Shan Huang
df9354d454
Merge "Add missing @Test annotation to ignoresGesture_transitionInProgress" into tm-dev am: 308f9bfa58 am: 9dd284ba1e am: 4ffa0e7214
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18407083
Change-Id: If17cecf90e1eb82eb46da6cadff543962bd6e8cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 21:05:31 +00:00
Shan Huang
eca23d560f
Merge "Fix broken animation on two consecutive swipes." into tm-dev am: 8a91edd4a3 am: ff20854f60 am: a1936419b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17963879
Change-Id: Iac74fdb78d569519a4a411f17ad65e99a1db34b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-18 20:59:54 +00:00
Ben Lin
26b096d288
Merge "Apply PiP Params if there was a deferred info." into tm-dev
2022-05-18 18:02:09 +00:00
Chilun Huang
97db297984
Create flicker tests for split screen
...
Create the base split screen flicker test and the CUJ of entering split
by dragging from all apps.
Bug: 231399426
Bug: 232878493
Test: atest EnterSplitScreenByDragFromAllApps
Change-Id: Ic684474457f5da28554ff801f3e03d585e8db9fb
2022-05-18 17:22:52 +00:00