Commit Graph
6721 Commits
Author SHA1 Message Date
Jon Miranda 1c96b6584c Merge "Allow touches on transient taskbar if ime is present." into tm-qpr-dev am: 912e6dd64d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20544543

Change-Id: I783620f7e1644d344fc66f59cb78a88dfc9b3488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29 23:06:16 +00:00
Jon Miranda 912e6dd64d Merge "Allow touches on transient taskbar if ime is present." into tm-qpr-dev 2022-11-29 22:42:03 +00:00
Jon Miranda 106cc895e9 Allow touches on transient taskbar if ime is present.
Bug: 260101467
Test: open chrome, enter url to pull up ime, swipe up to show taskbar,
      tap on taskbar icon

Change-Id: Ic8be6c2bb82fc9b8ab83572cb8622ac157078ea9
2022-11-29 11:30:39 -08:00
TreeHugger Robot d813bddf99 Merge "Fixing shortcuts not getting theme icons" into tm-qpr-dev am: 1330244f0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20546011

Change-Id: Iec0c682a4f1a81a4093a4971929603fc4dc32f21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-29 01:12:21 +00:00
TreeHugger Robot 1330244f0a Merge "Fixing shortcuts not getting theme icons" into tm-qpr-dev 2022-11-29 01:10:38 +00:00
Brian Isganitis 9ec55062c2 Merge changes Idae0c3d8,I8c599912 into tm-qpr-dev am: 39768edb67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20537774

Change-Id: I174c7ba634ba205d6a8b904124349bdeae89e929
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 22:35:48 +00:00
Brian Isganitis 39768edb67 Merge changes Idae0c3d8,I8c599912 into tm-qpr-dev
* changes:
  Stash taskbar while EDU is open.
  Remove Taskbar EDU icon wave animation.
2022-11-28 22:14:42 +00:00
TreeHugger Robot d214a581bd Merge "Disallow transient taskbar to un/stash in certain sys ui states" into tm-qpr-dev am: c04120e61e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20552584

Change-Id: Ie78637b99c552d9c37b90345ad8dcfce4cab2f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 19:29:32 +00:00
Alex Chau 0bb736df75 Merge "Allow 3p launchers to use swipe proxy in AllSetActivity" into tm-qpr-dev am: 735c016bef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20562094

Change-Id: Ib2cab4e40f0b7ad671a212303e925bed8911e736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-28 19:29:06 +00:00
TreeHugger Robot c04120e61e Merge "Disallow transient taskbar to un/stash in certain sys ui states" into tm-qpr-dev 2022-11-28 18:54:40 +00:00
Alex Chau 735c016bef Merge "Allow 3p launchers to use swipe proxy in AllSetActivity" into tm-qpr-dev 2022-11-28 18:53:59 +00:00
Sunny Goyal ce4896cff5 Fixing shortcuts not getting theme icons
Bug: 238650110
Test: Updated ThemeIconsTest
Change-Id: I803cd6eefa4e393bf19901a44712622adac7f4b1
2022-11-28 09:48:50 -08:00
Brian Isganitis 84633c1a9d Stash taskbar while EDU is open.
The stashing behavior is consistent with the All Apps overlay.

Test: Manual
Bug: 217261955
Change-Id: Idae0c3d829e806be6c18f00455f7ddd0d60f0efb
2022-11-28 16:02:40 +00:00
Brian Isganitis 92400681a9 Remove Taskbar EDU icon wave animation.
As per the latest mocks, the taskbar will be stashed during EDU to
prevent taskbar interactions that inadvertently close the EDU sheet.
Thus, this animation is no longer needed.

Test: Manual
Bug: 217261955
Change-Id: I8c5999121b7bb927b748d6163575dc4555ece84c
2022-11-28 15:46:17 +00:00
Pat Manning bc75ac55fd Allow 3p launchers to use swipe proxy in AllSetActivity
Bug: 257926371
Test: manual
Change-Id: If70412ecaa81481d8147abb3c52859ae4ea54a11
2022-11-24 14:57:08 +00:00
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
Jon Miranda 81bc0b78ce Disallow transient taskbar to un/stash in certain sys ui states
Bug: 258604928
Test: cant un/stash with keyguard, notifications, or qs open
      can un/stash in app as expected

Change-Id: Ib422a35fb31fc818123eae39ac3a7e6deb79f187
2022-11-23 15:26:06 -08: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
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
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