Commit Graph

443 Commits

Author SHA1 Message Date
Tony Wickham 7d41212d42 Merge "Remove extra overview threshold if the transient taskbar is already open" into tm-qpr-dev am: a329718dcf am: 4f90d44377
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20886425

Change-Id: I046559dca1c9e2866005de73663ca9e5d32940b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 03:18:59 +00:00
Tony Wickham a329718dcf Merge "Remove extra overview threshold if the transient taskbar is already open" into tm-qpr-dev 2023-01-14 01:09:52 +00:00
Tony Wickham 7d192c0e71 Remove extra overview threshold if the transient taskbar is already open
Test: Swipe to overview when taskbar is already opened vs not
Fixes: 264555943
Change-Id: Ib4c31b085ca51e50fd7442ff9a27a5f47822c242
2023-01-12 16:48:35 +00:00
Tony Huang f1a43efa0b Merge "Fix divider visibility issue on transient taskbar" into tm-qpr-dev am: d058f55578 am: 9898e5cc44
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20747781

Change-Id: I9e780abb3987bf8c40f24fafb5f906ff659ddee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-11 04:58:05 +00:00
Tony Huang d058f55578 Merge "Fix divider visibility issue on transient taskbar" into tm-qpr-dev 2023-01-11 03:45:14 +00:00
Schneider Victor-tulias 4f41701f6f Merge "Fix NPE from getting swipe pip to home animator finish transation after the surface has been released" into tm-qpr-dev am: 53808c3ed8 am: 4d5c11e4c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20712690

Change-Id: Iba1dd68988714e734c1160ea85d4a8be06892147
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-06 19:08:43 +00:00
Schneider Victor-tulias 53808c3ed8 Merge "Fix NPE from getting swipe pip to home animator finish transation after the surface has been released" into tm-qpr-dev 2023-01-06 18:38:21 +00:00
Schneider Victor-tulias d8a07fa030 Fix NPE from getting swipe pip to home animator finish transation after the surface has been released
Fixes: 243154747
Test: programmatically added delay to finish transation later
Change-Id: Ia667372678f2224406147f5659c5fc6f61f270ad
2023-01-04 13:53:37 -08:00
Schneider Victor-tulias 377eb40985 Revert^2 "Cancel gestures on launcher destroy"
f0de6cc2ca

Bug: 261816852
Fixes: 244593270
Fixes: 257976590
Fixes: 261504234
Test: FallbackRecentsTest#goToOverviewFromApp and FallbackRecentsTest#goToOverviewFromHome
Change-Id: If49a08fd62b99c9bbc007900b613b83747916f5f
2023-01-03 11:31:05 -08:00
Brandon Dayauon 5d71a83156 Merge "Move VibratorWrapper to AOSP" into tm-qpr-dev am: 2d3f189b80 am: da5f47e102
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20796546

Change-Id: Iebffd055f3a8622277de5fac24ba39ca8be24133
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-22 09:24:31 +00:00
Brandon Dayauon 5a31c9262e Move VibratorWrapper to AOSP
bug: 233751149
test: manually run and presubmit
Change-Id: I89ada0adf7254396238cb96d27bc265e28093f50
2022-12-20 10:27:21 -08:00
Tony Huang 0d7dc94d2e Fix divider visibility issue on transient taskbar
On legacy case, we hide divider bar when gesture start, but this
might cause divider hidden when transient taskbar case.
We should follow the timing it actually start entering overview
then hide divider.

Fix: 261376202
Test: manual
Test: pass existing tests
Change-Id: Iae1339ae0b42033075dd840fc071ba28a7d3e13a
2022-12-19 16:44:32 +08:00
Schneider Victor-tulias 887b56ce1b Merge "Log gesture velocity to help debug and help direct future gesture nav thresholds." 2022-12-15 09:42:20 +00:00
Schneider Victor-tulias 85127b4f47 Merge "[DO NOT MERGE] Log gesture velocity to help debug and help direct future gesture nav thresholds." into tm-qpr-dev 2022-12-15 09:42:15 +00:00
Brian Isganitis 1e37aae1dc Merge "Polish all apps taskbar unstash behavior for transient and persistent." into tm-qpr-dev am: 8216a26bfe am: 71f9faded9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20713695

Change-Id: I8917a9a3f4ceb856cf1fecf8699e61fb5a0bf459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-14 20:10:06 +00:00
Brian Isganitis 2a2f1b6cd3 Polish all apps taskbar unstash behavior for transient and persistent.
- During gestures from taskbar all apps, unstash immediately in
  transient.
- Overlay closes sooner if all apps is open (still done later for EDU).
- Taskbar stashes in overview when All Apps is opened.
- Transient app-window threshold is ignored if All Apps is opened.

Test: Manual
Fix: 262076812
Change-Id: I46b2dcdc75ee0cc15c1b47da2139ff8c20cf618a
2022-12-13 16:24:35 -05:00
Schneider Victor-tulias 80b25c756a [DO NOT MERGE] Log gesture velocity to help debug and help direct future gesture nav thresholds.
Bug: 259021562
Test: performed gestures and checked logs
Change-Id: If0dec4ef74c2ef2d1617d8c37f10f3ef9d96b2f5
2022-12-08 17:42:53 +00:00
Schneider Victor-tulias eb4a5c7cbd Log gesture velocity to help debug and help direct future gesture nav thresholds.
Bug: 259021562
Test: performed gestures and checked logs
Change-Id: If0dec4ef74c2ef2d1617d8c37f10f3ef9d96b2f5
2022-12-08 17:40:09 +00:00
Schneider Victor-tulias 673d6a01ed Merge "Revert "Cancel gestures on launcher destroy"" into tm-qpr-dev am: ad48decd4f am: d132ad4393
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20664263

Change-Id: I13f6d462dc8fabc0010661aea379bcf2357f9a24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08 15:47:36 +00:00
Schneider Victor-tulias ad48decd4f Merge "Revert "Cancel gestures on launcher destroy"" into tm-qpr-dev 2022-12-08 14:55:15 +00:00
Schneider Victor-tulias f0de6cc2ca Revert "Cancel gestures on launcher destroy"
Revert "Refactor SchedulerCallback implementation"

Revert submission 20555112-launcher-destroy-gestures

Reason for revert: causes test failures
Reverted Changes:
Ib43cdd597:Refactor SchedulerCallback implementation
Ia8e936e26:Cancel gestures on launcher destroy

Change-Id: I2199e39237b7c9fe25784b46e16960cd5f17c46c
2022-12-07 19:46:00 +00:00
TreeHugger Robot 036fe83e63 Merge "Cancel gestures on launcher destroy" into tm-qpr-dev am: c4d6dee069 am: f77ad4afd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20555112

Change-Id: Ia4e2a6627346fd949a7001c5bbdddbe3f41bb474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-05 21:46:08 +00:00
TreeHugger Robot c4d6dee069 Merge "Cancel gestures on launcher destroy" into tm-qpr-dev 2022-12-05 20:25:47 +00:00
Schneider Victor-tulias 65dda6d03e Cancel gestures on launcher destroy
A wide variety of gesture navigation bugs were caused if launcher happened to be recreated mid-gesture and we didn't handle it gracefully. Updated lifecycle callbacks to immediately cancel the ongoing gesture if launcher is destroyed.

Fixes: 244593270
Fixes: 257976590
Test: forcefully(programmatically) recreate on every other gesture nav handle touch down; check that following gestures are not broken and animations are not frozen
Change-Id: Ia8e936e26a42cfe26fc6bcd9eefb25d37bc08749
2022-12-05 08:11:50 -08:00
Jon Miranda 6ab0bc6d76 Merge "Fix window x-axis movement after gesture ends." into tm-qpr-dev am: 12053e958f am: fb6fe0ce82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20590521

Change-Id: I8c2ae63af9a2c768e3cc586ce808775fbec62c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-02 03:31:14 +00:00
Jon Miranda 6811fe8ab0 Fix window x-axis movement after gesture ends.
Previously we setClamp to false right after the gesture ends.
So when the page settle animation gets the page offset, it would
get the unclamped version which would cause the window to move
in the x-axis movement even if the window didn't actually move
during the gesture.

Now we ensure that we setClamp to false after the page transition
ends so that the scroll offset is consistent all the way until
the end of the animation.

Bug: 258851206
Test: 1. swipe a bit diagonally to bring up taskbar with
         no x-axis window movement
      2. release
      3. there should be no x-axis movement on window

Change-Id: Ic9949d11f2e8bc7ccbd737555a3d5551f09456da
2022-11-29 21:15:32 +00:00
Jon Miranda 923e6eead5 Merge "Check for isTaskbarPresent in addition to isTransientTaskbar when the method is called outside of taskbar." into tm-qpr-dev am: 3535426bea am: 01dae31db7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20544533

Change-Id: I40d80d5c41243ff383c156112966769232765cd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 03:15:09 +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
Tony Wickham 9a9a36268e Merge "Override displacement for transient taskbar instead of mCurrentShift" into tm-qpr-dev am: da858aab44 am: ed63ab8e14
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20535957

Change-Id: If3107046c9870361257132d48ed067466871c9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 19:45:51 +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 ee8a66445c Merge "Add revised thresholds for transient taskbar behind flag ENABLE_TASKBAR_REVISED_THRESHOLDS." into tm-qpr-dev am: e57cab1da8 am: e5e4d5a070
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20536952

Change-Id: I15b41ee05ddf6082fffc45fd7b8393ab6aa83dbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 17:52:16 +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
TreeHugger Robot 70fe810931 Merge "Cleanup overview threshold which was only needed for 2-button mode" into tm-qpr-dev am: 654ba7f6a8 am: 8ae825c3ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20524510

Change-Id: I4abfaadf653b016bec37778ba245f964e8ca02eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 02:24:01 +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
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
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
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
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
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 7b516983bc Merge "Clear drag views during swipe up animation progress" into tm-qpr-dev 2022-11-18 22:59:10 +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
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
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
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
Sihua Ma ff0f98dd03 Clear drag views during swipe up animation progress
This is to avoid clearing it too lately, at a point where the user starts to see a flicker on the screen.

There was already a report of this bug. Filing a bug report on my own because the original one is hard to find. I will mark that as fixed once I find it again.

Test: Manual
Fix: 259157574
Change-Id: Idc9bb67ebf6fc3ff6d78880f28c46d916a02ab77
2022-11-17 13:52:26 -08:00
Tracy Zhou 0b96f63514 Merge "Use movement on the trackpad instead of on screen for trackpad gestures used for gesture nav" 2022-11-11 22:31:35 +00:00
Tracy Zhou aef9d75f78 Use movement on the trackpad instead of on screen for trackpad gestures used for gesture nav
Bug: 254783214
Test: https://recall.googleplex.com/projects/3388b17c-d22f-46f8-b140-a102690377b4/sessions/f3311fbc-d8cf-4f19-b83c-8626aa285452
Change-Id: Iad2da5831af85dd3647e1e31b42fea0a6302b49c
2022-11-11 00:05:03 -08:00