Jon Miranda
01dae31db7
Merge "Check for isTaskbarPresent in addition to isTransientTaskbar when the method is called outside of taskbar." into tm-qpr-dev am: 3535426bea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20544533
Change-Id: I8d77fb2ef6f2a7572627f8cbcdd8b4102c3b78f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 01:59:25 +00:00
Jon Miranda
3535426bea
Merge "Check for isTaskbarPresent in addition to isTransientTaskbar when the method is called outside of taskbar." into tm-qpr-dev
2022-11-24 01:28:18 +00:00
Vinit Nayak
87d546e94a
Merge "Prevent empty recents going home when splitting with taskbar present" into tm-qpr-dev am: dba5a396b0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20545270
Change-Id: Id8f6f8c23515fa95ca58a395f8536e5efedd3df7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 23:01:52 +00:00
Vinit Nayak
dba5a396b0
Merge "Prevent empty recents going home when splitting with taskbar present" into tm-qpr-dev
2022-11-23 22:20:44 +00:00
Jon Miranda
807823155d
Check for isTaskbarPresent in addition to isTransientTaskbar
...
when the method is called outside of taskbar.
This prevents the case where phone runs transient taskbar logic.
Bug: 260006210
Test: added local logs, tested in phone mode
Change-Id: I600c06d6c797bd68461ac033dcc2c6158f221024
2022-11-23 12:05:43 -08:00
TreeHugger Robot
50286fe326
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-11-23 19:38:40 +00:00
Pat Manning
78fcf6aaeb
Merge "Set grid progress even when task count is 0." into tm-qpr-dev am: 82f05a857d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20508307
Change-Id: I8ef71e65d4eb2a7c9625a83d09360d16559041b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 12:01:02 +00:00
Pat Manning
82f05a857d
Merge "Set grid progress even when task count is 0." into tm-qpr-dev
2022-11-23 11:31:35 +00:00
Bill Yi
82e885471d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0987e308a9d904411dcfa29aabfbdf482ea59942
2022-11-22 13:34:50 -08:00
Vinit Nayak
182eb9dc15
Prevent empty recents going home when splitting with taskbar present
...
* Recents is empty, so it thinks we need to go home
* Split selection state prevents that, since second app can be
choosen from taskbar
Fixes: 260024461
Test: Recents still goes home when taskbar not present and
has no recent tasks. Doesn't go home when split with a single task;
second task launches correctly from taskbar
Change-Id: Ib5fc7989c66c5efccde53ea48319f9669cd664e2
2022-11-22 13:20:49 -08:00
Ikram Gabiyev
c9cb25ab3b
Merge "Remove on drag listener after drag ended" into tm-qpr-dev am: bb1e2a526a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20538917
Change-Id: I3f427604661c9c3baa38f01d65c9ab52c2b06f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 19:41:37 +00:00
Ikram Gabiyev
bb1e2a526a
Merge "Remove on drag listener after drag ended" into tm-qpr-dev
2022-11-22 19:24:37 +00:00
Tony Wickham
ed63ab8e14
Merge "Override displacement for transient taskbar instead of mCurrentShift" into tm-qpr-dev am: da858aab44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20535957
Change-Id: Ida928802918f736d178ad16926256982c02c479c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 19:12:31 +00:00
Tony Wickham
da858aab44
Merge "Override displacement for transient taskbar instead of mCurrentShift" into tm-qpr-dev
2022-11-22 18:37:22 +00:00
Jon Miranda
e5e4d5a070
Merge "Add revised thresholds for transient taskbar behind flag ENABLE_TASKBAR_REVISED_THRESHOLDS." into tm-qpr-dev am: e57cab1da8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20536952
Change-Id: I4afa4d3e50c501f8504d727e1973588927bcffb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 17:45:51 +00:00
Jon Miranda
e57cab1da8
Merge "Add revised thresholds for transient taskbar behind flag ENABLE_TASKBAR_REVISED_THRESHOLDS." into tm-qpr-dev
2022-11-22 17:20:21 +00:00
Ikram Gabiyev
7d633ecb07
Remove on drag listener after drag ended
...
Remove the on drag listener for the drag layer
in the taskbar after ACTION_DRAG_ENDED is received
This is an additional refactoring discussed
in ag/20490352
Bug: 258850827
Test: manually reproduced the steps in the bug
Change-Id: Ibe207001f41d3ba97a8acaf17d633cbd6682fafd
2022-11-22 06:07:09 +00:00
TreeHugger Robot
8ae825c3ff
Merge "Cleanup overview threshold which was only needed for 2-button mode" into tm-qpr-dev am: 654ba7f6a8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20524510
Change-Id: I4b79ec1b38509bdc5c7e855d06b529e756f2cdbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 01:50:19 +00:00
TreeHugger Robot
654ba7f6a8
Merge "Cleanup overview threshold which was only needed for 2-button mode" into tm-qpr-dev
2022-11-22 01:16:26 +00:00
Jon Miranda
3d72ac1a78
Add revised thresholds for transient taskbar behind flag ENABLE_TASKBAR_REVISED_THRESHOLDS.
...
Bug: 260002412
Test: enable flag
Change-Id: I4d82a853061b1540b6c6aea5e58b05a3ea6638e0
2022-11-21 23:46:34 +00:00
Tony Wickham
7a19cccafe
Override displacement for transient taskbar instead of mCurrentShift
...
mCurrentShift is based on displacement, but is used and set in different
places. To keep consistency throughout, we should override the
displacement at the source instead.
Test: manually swiped up between home/overview threshold and catch up
threshold; let go to go to overview and ensure no jump occurs.
Flag: teamfood (ENABLE_TRANSIENT_TASKBAR)
Fixes: 259981285
Change-Id: Id9f5b2bcdc2e56e15ddb6d93c4ee5d5ececc094d
2022-11-21 20:14:56 +00:00
Ats Jenk
5dd9cffa5d
Merge "Add onTaskMovedToFront to close floating views" into tm-qpr-dev am: 1a8b95a9d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20483285
Change-Id: I02c2f8c040064ec5c0f304fc86d76199f799abe1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 19:21:15 +00:00
Brian Isganitis
5ff72eaa46
Merge "Do not start drag from pre-drag if cancelled during animation." into tm-qpr-dev am: 0ccbd7334c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20522179
Change-Id: I19f12060d771c4121642a5dbaf8ccdd291795a66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 19:20:02 +00:00
Brian Isganitis
183f07e0da
Merge "Still launch disabled item if we can't handle its click." into tm-qpr-dev am: 455eca41be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20514045
Change-Id: Iada41f7e36da2570cf285c6291de801a7f15597f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 19:19:09 +00:00
Schneider Victor-tulias
8b9090cc35
Merge "Revert "Add debug logs to help identify when setRecentsAttachedToAppWindow will not animate properly."" into tm-qpr-dev am: b9e03da563
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20521649
Change-Id: Iaff26841709cacabfd6254e1e05c8a328eb36da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 19:16:40 +00:00
Ats Jenk
1a8b95a9d4
Merge "Add onTaskMovedToFront to close floating views" into tm-qpr-dev
2022-11-21 19:04:15 +00:00
Brian Isganitis
0ccbd7334c
Merge "Do not start drag from pre-drag if cancelled during animation." into tm-qpr-dev
2022-11-21 19:04:04 +00:00
Brian Isganitis
455eca41be
Merge "Still launch disabled item if we can't handle its click." into tm-qpr-dev
2022-11-21 19:02:44 +00:00
Schneider Victor-tulias
b9e03da563
Merge "Revert "Add debug logs to help identify when setRecentsAttachedToAppWindow will not animate properly."" into tm-qpr-dev
2022-11-21 19:01:04 +00:00
TreeHugger Robot
3ea711d992
Merge "Fix janky close animation when taskbar is unstashed" into tm-qpr-dev am: 104517cefb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20411886
Change-Id: I0a4f2a8755c49d230417c9b71afaa9ccd6ff410d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 18:49:35 +00:00
TreeHugger Robot
d46450dd1f
Merge "Fix NPE from using DeviceLockedInputConsumer after the surface has been released" into tm-qpr-dev am: 8700307b23
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20501358
Change-Id: Ie3cf43c96594bb0201678e189fd874a74535f4b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 18:49:07 +00:00
TreeHugger Robot
104517cefb
Merge "Fix janky close animation when taskbar is unstashed" into tm-qpr-dev
2022-11-21 18:30:19 +00:00
TreeHugger Robot
8700307b23
Merge "Fix NPE from using DeviceLockedInputConsumer after the surface has been released" into tm-qpr-dev
2022-11-21 18:18:49 +00:00
Tony Wickham
9cddf4133b
Cleanup overview threshold which was only needed for 2-button mode
...
- Removed hasReachedOverviewThreshold() and mPassedOverviewThreshold
- Changed calculateEndTargetForNonFling() to check velocity.y to
determine whether to go HOME or LAST_TASK when no other conditions are
met (e.g. mIsMotionPaused still goes to RECENTS). To allow transient
taskbar to override this so that user stays in LAST_TASK when invoking
the taskbar, kept setHasReachedHomeOverviewThreshold() but renamed it
to setCanSlowSwipeGoHome(),
Test: TaplTestsQuickstep, manually tested on tablet and phone to ensure
the correct end target was chosen when hitting this code path in
calculateEndTargetForNonFling
Flag: teamfood (ENABLE_TRANSIENT_TASKBAR)
Fixes: 259715295
Change-Id: I925be3433d7d2792cdc2a75a18dc575019f2cc95
2022-11-21 17:57:20 +00:00
Schneider Victor-tulias
1ba39205bc
Fix NPE from using DeviceLockedInputConsumer after the surface has been released
...
Fixes: 243154747
Test: swipe up from camera app while device is locked
Change-Id: Ia92e3e3cccb37e0d14592b0f3094f5aba1073300
2022-11-19 12:26:34 -08:00
Brian Isganitis
4ff301eb9d
Do not start drag from pre-drag if cancelled during animation.
...
This change affects the preDragCondition for icons that do not have a
popup menu. The condition assumes we are still in pre-drag after
DragView is finished animating, but the user can cancel the drag in this
time (e.g. by releasing their finger early).
Test: Manual. Holding and releasing on suspended icon does not crash,
while holding and dragging still works as expected.
Fix: 258233476
Change-Id: Ic76f785cffcbfe0fe51eb1473022f2dc34563070
2022-11-19 02:32:08 +00:00
Ikram Gabiyev
244d48097f
Merge "Stash transient taskbar upon icon drag" into tm-qpr-dev am: 793c37153a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20490352
Change-Id: I26e1675d9832f5c80c430450698a908e93951e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-19 02:27:13 +00:00
Jon Miranda
0964f40f1f
Merge "Prevent x-axis window movement during the initial swipe up to show transient taskbar" into tm-qpr-dev am: e912742234
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20470530
Change-Id: Ieb4dd888a30103985cc4a4aa10ce24824d8a41e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-19 02:27:02 +00:00
Ikram Gabiyev
793c37153a
Merge "Stash transient taskbar upon icon drag" into tm-qpr-dev
2022-11-19 02:19:25 +00:00
Jon Miranda
e912742234
Merge "Prevent x-axis window movement during the initial swipe up to show transient taskbar" into tm-qpr-dev
2022-11-19 01:58:37 +00:00
Sihua Ma
9af9ebcd2f
Merge "Clear drag views during swipe up animation progress" into tm-qpr-dev am: 7b516983bc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20446856
Change-Id: Ib41e1a777127f4562d3f5c7dd4242f5d84fb62b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 23:41:19 +00:00
Sihua Ma
7b516983bc
Merge "Clear drag views during swipe up animation progress" into tm-qpr-dev
2022-11-18 22:59:10 +00:00
Brian Isganitis
c970bd5b61
Merge "Only allow one TaskbarRecentsAnimationsListener at a time." into tm-qpr-dev am: 543528594a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20067011
Change-Id: Id526d0dae17759e6268b9621d53b6b810dddbd13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 21:53:42 +00:00
Brian Isganitis
543528594a
Merge "Only allow one TaskbarRecentsAnimationsListener at a time." into tm-qpr-dev
2022-11-18 21:38:58 +00:00
Hawkwood Glazier
3a93f9f5d4
Merge "Update PluginManager Import" into tm-qpr-dev am: d5ab17164d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20455291
Change-Id: Ia7c4699c1b2248582bc30afb930559e8bd3cb457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 21:26:36 +00:00
Jon Miranda
7ae410b011
Merge "Fix home/overview threshold." into tm-qpr-dev am: e3bcc7bf40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20511766
Change-Id: Ibbf9b180a26715787f9b3d1decb25fc7e8b96e35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 21:26:11 +00:00
Hawkwood Glazier
d5ab17164d
Merge "Update PluginManager Import" into tm-qpr-dev
2022-11-18 21:17:18 +00:00
Jon Miranda
08be3775f6
Prevent x-axis window movement during the initial swipe up to show transient taskbar
...
- If gesture starts and isLikelyToStartANewTask=true, we do not clamp
- If gesture starts and isLikelyToStartANewTask=false AND transient taskbar is not
already showing, we clamp the scrolling
Bug: 258851206
Test: swipe up to show taskbar, no x-axis movement
swipe left/right still works as expected
Change-Id: Iac194df63e03b4a28b49008983c88c165847aa31
2022-11-18 13:10:34 -08:00
Jon Miranda
e3bcc7bf40
Merge "Fix home/overview threshold." into tm-qpr-dev
2022-11-18 21:02:01 +00:00
Schneider Victor-tulias
e04a878709
Revert "Add debug logs to help identify when setRecentsAttachedToAppWindow will not animate properly."
...
This reverts commit a0be92c830 .
Reason for revert: Bug fixed and logs are too verbose
Test: ran launcher and checked logs
Fixes: 244593270
Change-Id: Ia67ba96b0b2146308f9cad1df884144edf2ab186
2022-11-18 11:00:33 -08:00