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
3b47499e3a
Merge "Add onTaskMovedToFront to close floating views" into tm-qpr-dev am: 1a8b95a9d4 am: 5dd9cffa5d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20483285
Change-Id: I6d3f263d76eb6cb7e788da724562a23895b584bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 19:27:25 +00:00
Brian Isganitis
a1585054e0
Merge "Do not start drag from pre-drag if cancelled during animation." into tm-qpr-dev am: 0ccbd7334c am: 5ff72eaa46
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20522179
Change-Id: I83fb16775b5080ed29fab628b7a4ddf7f3113237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 19:27:17 +00:00
Brian Isganitis
817b135167
Merge "Still launch disabled item if we can't handle its click." into tm-qpr-dev am: 455eca41be am: 183f07e0da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20514045
Change-Id: I1ef05a3627aa58874d4911acd8fba153b01d2b36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 19:27:09 +00:00
Schneider Victor-tulias
d2f650d1c3
Merge "Revert "Add debug logs to help identify when setRecentsAttachedToAppWindow will not animate properly."" into tm-qpr-dev am: b9e03da563 am: 8b9090cc35
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20521649
Change-Id: Ic9eeffb4cdfd4fd065e19de8abd046a9a553f69f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 19:26:53 +00:00
TreeHugger Robot
1450e67a32
Merge "Fix janky close animation when taskbar is unstashed" into tm-qpr-dev am: 104517cefb am: 3ea711d992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20411886
Change-Id: I17213ea8abe889aa6498da94ec543514202af6fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 19:26:30 +00:00
TreeHugger Robot
e447c1699b
Merge "Fix NPE from using DeviceLockedInputConsumer after the surface has been released" into tm-qpr-dev am: 8700307b23 am: d46450dd1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20501358
Change-Id: I6773cd859ed8190c12468ecf986f0a4a8c158274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-21 19:25:31 +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
Ikram Gabiyev
0de4950f04
Merge "Stash transient taskbar upon icon drag" into tm-qpr-dev am: 793c37153a am: 244d48097f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20490352
Change-Id: Ie56880bc1bcc4c116bcc5009cf77c5261384208c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-19 03:00:20 +00:00
Jon Miranda
1fd91813be
Merge "Prevent x-axis window movement during the initial swipe up to show transient taskbar" into tm-qpr-dev am: e912742234 am: 0964f40f1f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20470530
Change-Id: I8dd843a17838d3303a580f617c30a677ab9be5f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-19 02:58:41 +00: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
8697f47f57
Merge "Clear drag views during swipe up animation progress" into tm-qpr-dev am: 7b516983bc am: 9af9ebcd2f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20446856
Change-Id: I87f81741ff3719d7afe076bbb4d8844f66ac9a69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-19 00:14:41 +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
aeba8de92c
Merge "Only allow one TaskbarRecentsAnimationsListener at a time." into tm-qpr-dev am: 543528594a am: c970bd5b61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20067011
Change-Id: I0dda01f98f388955af9ff3d7452073662d2dd4fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 22:25:19 +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
8c0bef8df8
Merge "Update PluginManager Import" into tm-qpr-dev am: d5ab17164d am: 3a93f9f5d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20455291
Change-Id: I1076f35962967a87f69106fc300a5de6878a57bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 21:37:03 +00:00
Jon Miranda
0d99802c2d
Merge "Fix home/overview threshold." into tm-qpr-dev am: e3bcc7bf40 am: 7ae410b011
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20511766
Change-Id: Ifb399e0e3ac6365060b033aca610564ce5ab63d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 21:36:48 +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
TreeHugger Robot
da0c6436db
Merge "End live tile when quick settings expands, not just notification shade." into tm-qpr-dev am: 9b3aaf2b7d am: 1c3916daeb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20508312
Change-Id: I7c35505e38e8ab8f7f6a93086d40640361a08c0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 17:54:43 +00:00
TreeHugger Robot
1c3916daeb
Merge "End live tile when quick settings expands, not just notification shade." into tm-qpr-dev am: 9b3aaf2b7d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20508312
Change-Id: Ief0f13b064472a37924ce7fe5c05adf8f35c23a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 17:21:57 +00:00
TreeHugger Robot
9b3aaf2b7d
Merge "End live tile when quick settings expands, not just notification shade." into tm-qpr-dev
2022-11-18 16:45:30 +00:00
Jon Miranda
94566f97ec
Merge "Use mContext instead of TaskbarActivityContex to enable transient taskbar." into tm-qpr-dev am: 4b26e8f081 am: 81e33a07d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20511769
Change-Id: Ia09949deb5acd0c5a0d4317619abe38e80f3e406
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 04:13:00 +00:00
Jon Miranda
81e33a07d3
Merge "Use mContext instead of TaskbarActivityContex to enable transient taskbar." into tm-qpr-dev am: 4b26e8f081
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20511769
Change-Id: If783c22198f860dee1e184040f3aa64dea9805e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 03:41:01 +00:00
Jon Miranda
4b26e8f081
Merge "Use mContext instead of TaskbarActivityContex to enable transient taskbar." into tm-qpr-dev
2022-11-18 03:12:00 +00:00
Jon Miranda
21d4253c01
Fix home/overview threshold.
...
Fixes: 258836670
Test: Enable I06e16d78c179b7c3281f423ed8c7dd6cfc42229a to visually show
thresholds on screen
Swipe up to overview where taskbar not showing
and also with taskbar already showing
Change-Id: Ie7487a5f869c0718d9ee08209dee8331a01d5989
2022-11-17 18:09:31 -08:00
Brian Isganitis
c6ec460e83
Merge "Add a11y titles for taskbar windows." into tm-qpr-dev am: 50b3b62eba am: 57a3312468
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20239440
Change-Id: Ibf1bf6b7c7845c40ac8bcb1e706674f41230fdb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-18 02:03:05 +00:00