Commit Graph

6487 Commits

Author SHA1 Message Date
TreeHugger Robot
5210b87c96 Merge "Remove old caption bar before adding a new one" into tm-qpr-dev am: c3322a827a am: bf299abaf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20358384

Change-Id: I3e0cdcb1a6377700a73b002ae419d5a889f9d8ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 20:32:14 +00:00
TreeHugger Robot
bf299abaf0 Merge "Remove old caption bar before adding a new one" into tm-qpr-dev am: c3322a827a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20358384

Change-Id: Iff49073cbedd2cf1cc253eeaab788c79bd8e8d63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-08 19:57:23 +00:00
TreeHugger Robot
c3322a827a Merge "Remove old caption bar before adding a new one" into tm-qpr-dev 2022-11-08 19:48:40 +00:00
Evan Rosky
c6d79d2383 Merge "Revert^3 "Enable Shell Transitions"" 2022-11-08 00:01:41 +00:00
Evan Rosky
324b674209 Revert^3 "Enable Shell Transitions"
37ebac3d4a

Change-Id: Iae588a3579568f2f554cfb66bc243f972fa2ea37
2022-11-07 22:06:58 +00:00
Evan Rosky
80dff08040 Merge "Revert^2 "Enable Shell Transitions"" 2022-11-07 19:13:27 +00:00
Mady Mellor
9dc94dcda9 Merge "Fix an issue where the highlight for drag to split was incorrect" into tm-qpr-dev am: 61d495962f am: 30919118f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20389925

Change-Id: I04e21f3c8901865ca895ed4c0315b4bd99d11617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 18:12:24 +00:00
Mady Mellor
30919118f9 Merge "Fix an issue where the highlight for drag to split was incorrect" into tm-qpr-dev am: 61d495962f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20389925

Change-Id: I1042b767429ff7f9c1b181bce9332b7ca4076e27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 17:36:13 +00:00
Mady Mellor
61d495962f Merge "Fix an issue where the highlight for drag to split was incorrect" into tm-qpr-dev 2022-11-07 17:14:56 +00:00
TreeHugger Robot
be96587e69 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-07 16:39:51 +00:00
Galia Peycheva
907060a9c8 Merge "Revert "Fix pip update transaction out of order"" into tm-qpr-dev am: 2899ff81c2 am: 3f63f47ed9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20391545

Change-Id: Ib063e8b913098ac2111428e1a321f7a076e7e254
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 11:06:11 +00:00
Galia Peycheva
3f63f47ed9 Merge "Revert "Fix pip update transaction out of order"" into tm-qpr-dev am: 2899ff81c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20391545

Change-Id: Ic085a2ab32026fe1586b5b48087ec1bad0a73b79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-07 10:34:34 +00:00
Galia Peycheva
2899ff81c2 Merge "Revert "Fix pip update transaction out of order"" into tm-qpr-dev 2022-11-07 10:03:28 +00:00
Bill Yi
20e4d2e35f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Id2eb16df499a05844ec73a81a04b6b5293a815a2
2022-11-06 17:16:51 -08:00
TreeHugger Robot
04f130ff09 Merge "Fix splitscreen test: SnapToDismiss" into tm-qpr-dev am: 6cc66e4581 am: 8960819a0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20348773

Change-Id: I69536773fc1e928858f7c51b8ab2e953d2f4cf3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 16:55:47 +00:00
TreeHugger Robot
8960819a0b Merge "Fix splitscreen test: SnapToDismiss" into tm-qpr-dev am: 6cc66e4581
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20348773

Change-Id: I580ac414e3b89ba7079e6510fca6b9b45dffb63e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-06 16:23:14 +00:00
TreeHugger Robot
6cc66e4581 Merge "Fix splitscreen test: SnapToDismiss" into tm-qpr-dev 2022-11-06 15:52:52 +00:00
Michael Groover
c41aa95b6e Merge "Revert "Add unaudited exported flag to exposed runtime receivers"" 2022-11-04 22:50:16 +00:00
Neha Jain
d53696fecf Revert "Fix pip update transaction out of order"
This reverts commit c3ebae4ca8.

Reason for revert: b/257379026

Change-Id: Id5f4cf24fe2a65b70ae5f024c2fcd5f16b92bbb0
2022-11-04 22:08:36 +00:00
Ats Jenk
5aa98410e7 Remove old caption bar before adding a new one
When adding a new window caption, check if old one is present. If it is,
remove it before adding a new one.

Bug: 257121505
Test: manual, open a task in desktop mode, swipe to overview, click on
overview tile, task is again visible, resize task to check that only one
caption bar is shown

Change-Id: Ib4cc3934207f6d51a2ef101e4685285dd3f82743
2022-11-04 14:36:35 -07:00
Mady Mellor
d43f418ffd Fix an issue where the highlight for drag to split was incorrect
1. Have a fullscreen immersive app open
2. Swipe bottom of the screen to show the taskbar
3. Drag and app

In 3 when you start dragging the app, the taskbar hides because you're
in an immersive app, this causes the rect for the drag targets to
be different, so we'd end up animating the drop zones to switch even
though the type of the target was the same. Fix is to check that the
target type is different before animating the switch.

Bug: 255008704
Test: manual
Change-Id: Ic8a7b23e79c54ba74aa6bebf528fb0b3894a8fa1
2022-11-04 12:24:09 -07:00
Ats Jenk
01cd6f81a8 Merge "Clean up bubbles home gesture flag" into tm-qpr-dev am: 28ba402dea am: 3160d38675
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20377745

Change-Id: I9e8ef157e7de4ce44e4c7eaa5e62a15ced03f80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 18:58:24 +00:00
Ats Jenk
3160d38675 Merge "Clean up bubbles home gesture flag" into tm-qpr-dev am: 28ba402dea
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20377745

Change-Id: I8472d88146a86846a3a8de1c4073f61e69097d10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 18:13:35 +00:00
Artyom Palvelev
9041b19e13 Revert "Add unaudited exported flag to exposed runtime receivers"
This reverts commit 0d9f847f76.

Reason for revert: failing tests b/257410439

Change-Id: I79f140708b1c78d9a4548a078906db6ab5fefa16
2022-11-04 12:34:59 +00:00
Jeff Chang
b44a40442b Fix splitscreen test: SnapToDismiss
The test cases verify onSnappedToDismiss callbacks properly invoked
when the snap target indicates dismissing split. The callback is
invoked more than once since the start position is the same as the
end position when flingDividePosition is invoked. This CL updates
the current position to make sure the callback is invoked once.

Bug: 257348773
Test: atest SplitLayoutTests
Change-Id: I5742d3db1ab6d5c80c4b4ffa1a9465655c73ab11
2022-11-04 14:37:41 +08:00
Ats Jenk
dfdce38745 Clean up bubbles home gesture flag
Remove bubbles home gesture flag. It is turned on by default.

Bug: 256873558
Test: mp sysuig
Change-Id: I0e7cf193d1436d241a81b99be502c9c765abfaca
2022-11-03 20:21:15 -07:00
TreeHugger Robot
3d0067a315 Merge "Add unaudited exported flag to exposed runtime receivers" 2022-11-04 03:18:02 +00:00
Mady Mellor
cd84f3b368 Merge changes from topic "mm_remove_floating_tasks" into tm-qpr-dev am: 33a70394ca am: cd622f17c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20345965

Change-Id: I01118102b1edcccd1f0e4cb62b7442026149ce0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-04 00:58:51 +00:00
Mady Mellor
cd622f17c4 Merge changes from topic "mm_remove_floating_tasks" into tm-qpr-dev am: 33a70394ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20345965

Change-Id: I87f986d49f1c0ec13bf822ef44784e36921a02a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-03 23:39:01 +00:00
Mady Mellor
33a70394ca Merge changes from topic "mm_remove_floating_tasks" into tm-qpr-dev
* changes:
  Add a flag for the bubble bar
  Remove FloatingTaskController & replace usages with Bubbles
2022-11-03 22:48:32 +00:00
Evan Rosky
dde76dd552 Merge "Share apply token between WMCore and WMShell" 2022-11-03 16:43:25 +00:00
TreeHugger Robot
8408bf6431 Merge "Fix the case that the app doesn't exist" 2022-11-03 09:09:09 +00:00
Jerry Chang
dcab87c9c6 Merge "Add sub owner to common/split and tests" into tm-qpr-dev 2022-11-03 07:20:34 +00:00
Arthur Hung
083d610795 Merge "Intruduce Cross Task Animator" 2022-11-03 01:14:08 +00:00
Evan Rosky
9071563b83 Share apply token between WMCore and WMShell
This means WMShell/Core/Launcher are using the same
apply token.

Barring alternatives, this is necessary to make sure
that transitions work properly (since surface operations
span multiple process). Otherwise, even if transactions
are received by SF in the correct order, they can be
applied in a different order.

Bug: 256046837
Test: atest PipRotationTest_ShellTransit and check for leaked
      tasks in surface dump.
Change-Id: I0424e66ed347576718f62b1e598ae116720aa70d
2022-11-02 21:58:57 +00:00
Mady Mellor
6188843762 Add a flag for the bubble bar
This is an UnreleasedFlag which is only available in SysUI, so we
set it on Bubbles via BubblesManager which is part of SysUI.

Changes to support bubble bar will happen behind this flag.

Bug: 253318833
Bug: 256873975
Test: manual - enable flag and add a bubble on a large screen device
             - observe that the bubbles are pinned to the bottom
Change-Id: I0d86a71b66db683837bf639d9067d92703b4364e
2022-11-02 13:30:12 -07:00
Mateusz Cicheński
89b3a6b46b Merge "Animate PiP away on inset changes." into tm-qpr-dev am: 3aac107972 am: 1099f31450
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20349632

Change-Id: Ib96f863ad9e0fc8b316b775b2b88ce2c160eb1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 18:16:49 +00:00
Mateusz Cicheński
e717892d35 Merge "Skip moving PiP for IME/shelf change if user is dragging." into tm-qpr-dev am: d04f92f27d am: 2d4b3f6d55
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291084

Change-Id: I3474dc8b2376b5194acfd3d3091e8cf7925addba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 18:13:03 +00:00
Mateusz Cicheński
1099f31450 Merge "Animate PiP away on inset changes." into tm-qpr-dev am: 3aac107972
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20349632

Change-Id: Ib2404cc4fe88646aa7b2b94a0e57a87d4bf52118
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 17:41:12 +00:00
Mateusz Cicheński
2d4b3f6d55 Merge "Skip moving PiP for IME/shelf change if user is dragging." into tm-qpr-dev am: d04f92f27d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20291084

Change-Id: Ia8148ff598218451c344d6a82793f47c6be8e536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 17:38:33 +00:00
Mateusz Cicheński
3aac107972 Merge "Animate PiP away on inset changes." into tm-qpr-dev 2022-11-02 17:37:11 +00:00
Mateusz Cicheński
d04f92f27d Merge "Skip moving PiP for IME/shelf change if user is dragging." into tm-qpr-dev 2022-11-02 17:36:37 +00:00
Mady Mellor
46faccde4a Remove FloatingTaskController & replace usages with Bubbles
Switch to using newly exposed method Bubbles#showAppBubble as what
FloatingTaskController does is no longer POR.

Calling this allows 1 bubble from a specific app to be added to the
stack. The only user of this method is NoteTaskController which is guarded by the NOTE_TASK.

Bug: 237678727
Test: treehugger
Change-Id: I47c5c010a050796eff848ba3fcabc40cf5fbd902
2022-11-02 10:01:32 -07:00
Jerry Chang
23f1e2836d Add sub owner to common/split and tests
Ignore-AOSP-First: no merge branch from AOSP
Test: n/a
Bug: 207582920
Change-Id: I46cc309b2453296910c8516cffd2b5b352376b01
Merged-In: I46cc309b2453296910c8516cffd2b5b352376b01
2022-11-02 12:35:40 +00:00
Chilun Huang
2bf00cccde Fix the case that the app doesn't exist
Missing the case that the app doesn't exist. This CL is to fix it.

Bug: 247997619
Test: atest WMShellFlickerTests:EnterSplitScreenByDragFromShortcut

Change-Id: Id9c8c4a41bc049d784a10d9e2720cf636c0ce769
2022-11-02 19:51:21 +08:00
Galia Peycheva
73d5bccb34 Merge "Fix pip update transaction out of order" into tm-qpr-dev am: 71bf4aaf9e am: a50d2b700c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20338925

Change-Id: Ib28f15044d6ada4202805fec51610e92c8cab76b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 10:35:53 +00:00
Galia Peycheva
a50d2b700c Merge "Fix pip update transaction out of order" into tm-qpr-dev am: 71bf4aaf9e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20338925

Change-Id: Iae8927204e62fbadbc9245747ebf2b923b2e10d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 10:05:09 +00:00
Galia Peycheva
71bf4aaf9e Merge "Fix pip update transaction out of order" into tm-qpr-dev 2022-11-02 09:31:31 +00:00
Tony Huang
cbf9157291 Merge "Update divider value when config changed" into tm-qpr-dev am: 61b0628896 am: 1d9183face
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20336906

Change-Id: I175238738fa2f49ae79a4740305f3e241885badb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 07:32:24 +00:00
Tony Huang
1d9183face Merge "Update divider value when config changed" into tm-qpr-dev am: 61b0628896
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20336906

Change-Id: Iecc14c32e8b2283459b9a8c24d39c5877096f7ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-02 06:34:41 +00:00