9fe0ef220b
Merge "Fix not tracking splitting tasks correctly" into udc-dev am: 303d6101fb am: d7a75e5b9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23149642
Change-Id: I5637171f6d6042cf0be2b6c620be46b6ff33dab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 01:20:31 +00:00
303d6101fb
Merge "Fix not tracking splitting tasks correctly" into udc-dev
2023-05-12 00:49:21 +00:00
ce1017e075
Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004
Change-Id: If5bef04bd9e704371df3bf4568297be4f084ee50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:56:18 +00:00
9b83175350
Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637
Change-Id: I16f2310feec73c677ae603649205bdeb233388d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:55:29 +00:00
e04071e19c
Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev
2023-05-11 23:31:21 +00:00
de1b42b957
Only refresh the launcher resume state when the task launch fails
...
- The previous call from TaskbarLauncherStateController caused a
regression due to the inability for the code to distinguish
Normal -> Background -> Normal when tapping on the bar area
or from failing to launch a task, so both cases were triggering
the resumed state to cycle and start an animation. For now we can
only handle the task-launch fail case.
Bug: 268448123
Fixes: 281966662
Test: Quickswitch to an activity that finishes when resumed
Change-Id: Ie4692dd85252540ff47633978c0e6e4adbb1bdd0
2023-05-11 23:31:14 +00:00
8d402efac2
Merge "Consistently multiply touch slop for InputConsumers" into udc-dev
2023-05-11 23:21:33 +00:00
1e92350f86
Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739
Change-Id: I2a447fc36ab12ce58df08bc53f6e9be3c95dee3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:46:40 +00:00
52d4764576
Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev
2023-05-11 20:58:02 +00:00
662787540c
Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"
...
This reverts commit 7344766886
2023-05-11 18:50:35 +00:00
be1131c137
Merge "Make taskbar touchable region smaller in Overview" into udc-dev am: fda9f3d430
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22995656
Change-Id: Id7f4594f69b01850915405574df45bd7d6e9fc6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 15:25:22 +00:00
fda9f3d430
Merge "Make taskbar touchable region smaller in Overview" into udc-dev
2023-05-11 14:48:18 +00:00
3bc763f5a3
Make taskbar touchable region smaller in Overview
...
While in overview, makes the touchable region smaller so touches can go to the window below and trigger tapping on overview to go home.
Bug: 269985301
Test: Manual (TAPL in a following CL)
Flag: none
Change-Id: Ie8c7719090c387f951d78cf0fc47e6d9ed192f27
2023-05-11 14:45:41 +00:00
858a6e9c1e
Defer intercepting touch events to actually start shifting tasks am: 2792271688
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23163166
Change-Id: Ie73cad69ffa904a00591d4f3e4293be6070b8388
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 09:07:33 +00:00
87ed2f1176
Fix not tracking splitting tasks correctly
...
When drag-to-repace one of the splitting tasks, it might reports to
TopTaskTracker the original task changed to undefined after repoting the
new task appeared in a split pair. Result to clear the split tasks
record unexpectedly in TopTaskTracker. This makes sure to clear the
correct stage and prevent override the correct split record.
Fix: 277982233
Test: manual check the behavior and verify the reocrd in TopTaskTracker
Change-Id: Ifce2efdde6d99508f1afa844b3ad424071e13a8f
2023-05-11 08:53:23 +00:00
2792271688
Defer intercepting touch events to actually start shifting tasks
...
Fix: 278740578
Test: http://recall/-/fLARJNt42LVxc3tt86SneW/d9A443iE2UQVktVc2YqwT2
Change-Id: I81efc87f19775dba96bab581a1c443d6070f6ebc
2023-05-11 05:44:16 +00:00
233ab99093
Consistently multiply touch slop for InputConsumers
...
Fixes: 268651129
Test: TaplTestsQuickstep; manually swipe up from various InputConsumers
Change-Id: I0a3baf654092a1a0bdafbfc734ec394668ba60f6
2023-05-11 03:33:57 +00:00
a66aa3a31d
Merge "Fixing TaplTests" into udc-dev am: 4d559a6c92
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23139495
Change-Id: I043ff37f4ee2dc69b959641e1ff339b19ee3b840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 00:20:55 +00:00
8ff2eec82c
Merge "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash" into udc-dev am: 3291bfecf2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22534248
Change-Id: Id30ee20f29b5a2ae1a53780d39b157bffafb87da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 23:39:31 +00:00
4d559a6c92
Merge "Fixing TaplTests" into udc-dev
2023-05-10 23:19:39 +00:00
3291bfecf2
Merge "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash" into udc-dev
2023-05-10 23:11:42 +00:00
91ce44e3b6
Merge "Revert "Fix null-pointers in SurfaceTransactionApplier constructor."" into udc-dev am: f3fdca59d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23143004
Change-Id: I1db198140b10b11fb79122d63ea830d47db24b96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:07:07 +00:00
360b5a301a
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-05-10 21:55:16 +00:00
f3fdca59d2
Merge "Revert "Fix null-pointers in SurfaceTransactionApplier constructor."" into udc-dev
2023-05-10 21:40:40 +00:00
64809780ce
Revert "Fix null-pointers in SurfaceTransactionApplier constructor."
...
This reverts commit d86c5657e0
2023-05-10 19:34:01 +00:00
2e0770af08
Merge "Fixing NPE in TransfromParams.java" into udc-dev am: 4d17468f88
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23120958
Change-Id: I33acacb6ffcbcb22801b2ae292e5aacce85e3b20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 19:13:09 +00:00
4d17468f88
Merge "Fixing NPE in TransfromParams.java" into udc-dev
2023-05-10 18:57:17 +00:00
c875f27912
Fixing TaplTests
...
Test: Pre-Submit
Fixes: 281772186
Flag: not needed
Change-Id: Ibe2987a69c9ca393ed267e755a3b99826164fee4
2023-05-10 10:47:45 -07:00
c6afe67f50
Merge "Animate the position of the selected bubble arrow in the expanded bubble bar." into udc-dev am: fb085e6393
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117884
Change-Id: Ic653f205c2c3210f5af7e42cb9af66c6f54355a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 17:47:26 +00:00
fb085e6393
Merge "Animate the position of the selected bubble arrow in the expanded bubble bar." into udc-dev
2023-05-10 16:49:09 +00:00
cd5558fcd9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If7588e84680dbc8f4fcc616af06914ab7c57d1a7
2023-05-09 16:04:17 -07:00
77f1806491
Merge "[5/n] Log cardinality to StatsLogManager" into udc-dev am: d382a4880b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23088599
Change-Id: Ie4234f9196ca701c78bf7393a0072d7a4147c3c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 21:57:19 +00:00
4aa44e5169
Fixing NPE in TransfromParams.java
...
- we were not actually using mRecentsSurface so we no longer need to compute that. By removing this we will also fix the NPE.
Test: Pre-Submit
Fixes: 269716918
Flag: not needed
Change-Id: Ief4be341061a1c914456d6740f175662ccebc364
2023-05-09 14:45:17 -07:00
d382a4880b
Merge "[5/n] Log cardinality to StatsLogManager" into udc-dev
2023-05-09 21:33:36 +00:00
05af38cb53
Merge "Un-Split TaplTestsTaskbar" into udc-dev am: 53b4435b7e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821856
Change-Id: I3f369a4c362bc06d26b6f5b52cd6c6c871456c6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 20:50:54 +00:00
4f9ddc0db4
Merge "Fix tutorial menu layout issues" into udc-dev am: 458971616d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23089641
Change-Id: I6c5a6ae225028f269be2976a57405adeeb7f38aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 20:50:44 +00:00
1529c40e6a
Merge "Restore Recents TaskView based on all taskIDs, not first" into udc-dev am: 5f475a2f48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22998399
Change-Id: I4b5d6f902fc34967c72db5fd790b0328243b2512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 20:50:26 +00:00
53b4435b7e
Merge "Un-Split TaplTestsTaskbar" into udc-dev
2023-05-09 20:43:01 +00:00
4e909d07ac
Animate the position of the selected bubble arrow in the expanded bubble bar.
...
Fixes: 280605070
Test: Tested on a physical device
Change-Id: I961254527ba9a26d211c2c348a937a424fa2fb4d
2023-05-09 16:35:30 -04:00
458971616d
Merge "Fix tutorial menu layout issues" into udc-dev
2023-05-09 20:18:07 +00:00
5f475a2f48
Merge "Restore Recents TaskView based on all taskIDs, not first" into udc-dev
2023-05-09 20:15:01 +00:00
b4d3315caa
Merge "Wire up the important conversation bit in BubbleBarController." into udc-dev am: a72094ad66
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23039499
Change-Id: Icb686c04bea438aa9bc5bdf6d741f7336229b142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 19:44:19 +00:00
7344766886
Modify Taskbar code to accommodate bubble bar gesture to stash/unstash
...
* Bubble bar typically follows the behavior of taskbar - if taskbar
is shown, the bubble bar is shown, if taskbar hides, bubble bar
hides.
* The bubble bar has 3 states: stashed, collapsed (unstashed but
the bubbles are not expanded), and expanded. When bubbles are
expanded, this means WMShell is rendering the bubble
expanded view. In this situation taskbar becomes collapsed.
Bug: 253318833
Test: manual, with other CLs, see go/bubble-bar-tests
Flag: WM_BUBBLE_BAR
Change-Id: Ic210c382e7482c259ae543a0dc083fe9305cbf5b
2023-05-09 12:37:14 -07:00
a72094ad66
Merge "Wire up the important conversation bit in BubbleBarController." into udc-dev
2023-05-09 18:02:53 +00:00
9349dc9e1d
Merge "Taskbar All Apps Icon Shortcuts Popup Accesiiblity" into udc-dev am: 75109c7abc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23035380
Change-Id: I5b674580376f99dd1eebb8926f7303b098c7e569
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 17:00:51 +00:00
9569ce86a2
Un-Split TaplTestsTaskbar
...
Before we use TaskbarModeSwitch but had a drawback where we would not know which variant of taskbar the test failed for. So, we split the taskbar tests into transient and persistent for better error logs and debugging.
But, now we can use Parameterized Test Runner to achieve the same and do not have to duplicate test code for testing two different variants of Taskbar.
There can be instances where we only want to test certain taskbar variant only, we have separated files for that.
Test: Presubmit
Bug: 267648422
Flag: not needed
Change-Id: I4322498f13d257a5f1793b008f45b09ac9b9f3ff
2023-05-09 09:36:09 -07:00
75109c7abc
Merge "Taskbar All Apps Icon Shortcuts Popup Accesiiblity" into udc-dev
2023-05-09 16:19:44 +00:00
2a077e73cf
Enable flag ENABLE_SPLIT_LAUNCH_DATA_REFACTOR am: b33a2e0762
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22958378
Change-Id: Iff36d989bdcaae465b2e9a59e3a0d67588b4da8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 07:12:26 +00:00
b33a2e0762
Enable flag ENABLE_SPLIT_LAUNCH_DATA_REFACTOR
...
Flag: ENABLE_SPLIT_LAUNCH_DATA_REFACTOR
Bug: 279494325
Change-Id: I9c58ba50f0269c69a12f548a1873c2d8251f6243
2023-05-08 17:27:03 -07:00
11ace3672a
Merge "Potential fix for end callback not being run in 3-button" into udc-dev am: 606c4bfc59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23019205
Change-Id: Ie5f14a244232f96171e158932f4f4c06740b21de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 00:18:51 +00:00
Jerry Chang
Winson Chung
Tony Wickham
Treehugger Robot
Mady Mellor
Thales Lima
Jagrut Desai
Sunny Goyal
Bill Yi
Fengjiang Li
Schneider Victor-tulias
Vinit Nayak
Liran Binyamin