Commit Graph

15194 Commits

Author SHA1 Message Date
Brandon Dayauon cfca5cb416 Merge "Separate animations and add dragOffSet points in dragOptions" into udc-dev am: 125e121834 am: fb51d87af8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22862532

Change-Id: Id58abd3541cc871ba54d91121a27b888acaad591
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 16:30:33 +00:00
Brandon Dayauon fb51d87af8 Merge "Separate animations and add dragOffSet points in dragOptions" into udc-dev am: 125e121834
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22862532

Change-Id: I93f9d76aeee50573082581ad0ea0f072f46e184b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 15:54:51 +00:00
Brandon Dayauon 125e121834 Merge "Separate animations and add dragOffSet points in dragOptions" into udc-dev 2023-05-12 15:22:48 +00:00
Jerry Chang dd72e04160 Merge "Fix not tracking splitting tasks correctly" into udc-dev am: 303d6101fb am: 150bf694d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23149642

Change-Id: I144ab73e559924d4fc204d506661dfa2ee854ea3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 01:43:47 +00:00
Jerry Chang 150bf694d4 Merge "Fix not tracking splitting tasks correctly" into udc-dev am: 303d6101fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23149642

Change-Id: I1727865114e341f322dd7349c878e1367c9ea748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 01:02:33 +00:00
Jerry Chang 303d6101fb Merge "Fix not tracking splitting tasks correctly" into udc-dev 2023-05-12 00:49:21 +00:00
Winson Chung 3e62b41ea3 Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c am: 436229450b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004

Change-Id: I64d9efcc3af0dcdb2d81d3d3dbd8208cbfa46ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:41:17 +00:00
Tony Wickham c75bd69dbc Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2 am: cfa7876f2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637

Change-Id: I0f7894052c65cfa8d7798474da43aa4eefdb445c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:38:48 +00:00
Winson Chung 436229450b 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: If3358102e727d7f58538780c6337ddc9c325f385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:59:15 +00:00
Tony Wickham cfa7876f2a 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: Iec7ffcf1962731ad929fc630e860a1931e250c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:58:56 +00:00
Winson Chung e04071e19c Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev 2023-05-11 23:31:21 +00:00
Winson Chung 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
Tony Wickham 8d402efac2 Merge "Consistently multiply touch slop for InputConsumers" into udc-dev 2023-05-11 23:21:33 +00:00
Treehugger Robot 93005695c9 Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 7f51cb5513
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739

Change-Id: Ie84e306e7eeca2141c73488539b7345547b25dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:08:09 +00:00
Treehugger Robot 7f51cb5513 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: I36e6ccc498b5cd64239820ad0f144afe586730f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:28:30 +00:00
Treehugger Robot 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
Mady Mellor 662787540c Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"
This reverts commit 7344766886.

Reason for revert: b/282035015

Change-Id: I38db287f730048d3e1e5041f1853bdae214e1a66
2023-05-11 18:50:35 +00:00
Brandon Dayauon e63401e711 Separate animations and add dragOffSet points in dragOptions
For 1, when animateShift() is called shiftAnimation() is the only thing needed.
2, by having point saved in preDragCondition, we can use that to update the drag layers and not have to
modify registrationX/Y later

Removed dragVisualizedOffset since it does not do anything.

There is an issue that also needs to be fixed if user decides to long click
on a search result and let go, the icon flashes at the touch point when you let go.. so we check when mContent can be shown in DragView
depending on if there is dragOffset.
If there is dragOffset, set mContent to invisible.
If there is no dragOffset, set mContent to visible because it doesn't matter as the original content is at the same spot.

bug: 245659929
test: manual: video: https://drive.google.com/file/d/1JQ0pud31HU0WlrqecX0v1cdPKQ37jQCf/view?usp=sharing
Change-Id: I4d2276b9c43e1e92c45d8538b8dde70baa84a5e8
2023-05-11 10:50:17 -07:00
Thales Lima 072d338505 Merge "Make taskbar touchable region smaller in Overview" into udc-dev am: fda9f3d430 am: 79bc256775
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22995656

Change-Id: Ia7ac787b25543fca86abb8a3dda1cf34f5f5762c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 16:06:48 +00:00
Thales Lima 79bc256775 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: Id8edb480bde892d247741714ed1bd2b020e89294
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:28:44 +00:00
Thales Lima fda9f3d430 Merge "Make taskbar touchable region smaller in Overview" into udc-dev 2023-05-11 14:48:18 +00:00
Thales Lima 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
Jerry Chang 3ecd8a8ac9 Defer intercepting touch events to actually start shifting tasks am: 2792271688 am: 45aa875f1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23163166

Change-Id: I6c2e5cca96d4724b04f210994d9e814cf812c732
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 09:47:06 +00:00
Jerry Chang 45aa875f1a 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: I3460b81ac7d3c74b9c05f22c8c269b25eaf35c51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 09:06:29 +00:00
Jerry Chang 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
Jerry Chang 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
Tony Wickham 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
Jagrut Desai fa116fb969 Merge "Fixing TaplTests" into udc-dev am: 4d559a6c92 am: bbcd04ab6e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23139495

Change-Id: I1c26ad08b3e9811cfee204f22d0f53425078bf01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 00:28:57 +00:00
Mady Mellor dba68d0443 Merge "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash" into udc-dev am: 3291bfecf2 am: 6be447b877
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22534248

Change-Id: I9225161730f5c0c3c8198b2af116816ec71f6e14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:53:32 +00:00
Treehugger Robot d579a06e65 Merge "Revert "Fix null-pointers in SurfaceTransactionApplier constructor."" into udc-dev am: f3fdca59d2 am: 34fa499029
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23143004

Change-Id: I61e45f9e60e0668629f6f67e7db582dea517199e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:46:48 +00:00
Jagrut Desai 8cfb17b949 Merge "Fixing NPE in TransfromParams.java" into udc-dev am: 4d17468f88 am: 862585eb1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23120958

Change-Id: I03fac206ced452b978fa38e9af33e5423b5dca34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:46:38 +00:00
Treehugger Robot f4900fbc58 Merge "Animate the position of the selected bubble arrow in the expanded bubble bar." into udc-dev am: fb085e6393 am: 569862b756
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117884

Change-Id: I313c596b6d0562f0a4b896072c6299f15a81019b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:39:34 +00:00
Bill Yi c606341785 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-05-10 23:28:45 +00:00
Jagrut Desai bbcd04ab6e Merge "Fixing TaplTests" into udc-dev am: 4d559a6c92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23139495

Change-Id: I03643bcaf76ee613a0b114051cd07b9e7dfda898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:21:05 +00:00
Mady Mellor 6be447b877 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: Ieeb3d1f47d1b8f7ffdbd11efc9d0c2379ed98952
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:20:46 +00:00
Jagrut Desai 4d559a6c92 Merge "Fixing TaplTests" into udc-dev 2023-05-10 23:19:39 +00:00
Mady Mellor 3291bfecf2 Merge "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash" into udc-dev 2023-05-10 23:11:42 +00:00
Treehugger Robot 34fa499029 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: If2d7d00987a057164717ce246490e6bdb20fe3e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 22:12:09 +00:00
Treehugger Robot 360b5a301a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-05-10 21:55:16 +00:00
Treehugger Robot f3fdca59d2 Merge "Revert "Fix null-pointers in SurfaceTransactionApplier constructor."" into udc-dev 2023-05-10 21:40:40 +00:00
Jagrut Desai 862585eb1b 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: I7e0c19d989c539ffc4bd54bcc002378d921d96ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:38:52 +00:00
Sunny Goyal 64809780ce Revert "Fix null-pointers in SurfaceTransactionApplier constructor."
This reverts commit d86c5657e0.

Reason for revert: b/281294745

Change-Id: Ib2680b60346a9bc5932057707d0ef105441f324d
2023-05-10 19:34:01 +00:00
Jagrut Desai 4d17468f88 Merge "Fixing NPE in TransfromParams.java" into udc-dev 2023-05-10 18:57:17 +00:00
Treehugger Robot 569862b756 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: Iefc56e4eb7f2e8185d0cb96e20a05b35aa93792c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 17:52:25 +00:00
Jagrut Desai c875f27912 Fixing TaplTests
Test: Pre-Submit
Fixes: 281772186
Flag: not needed
Change-Id: Ibe2987a69c9ca393ed267e755a3b99826164fee4
2023-05-10 10:47:45 -07:00
Treehugger Robot 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
Fengjiang Li 177e9b6832 Merge "[5/n] Log cardinality to StatsLogManager" into udc-dev am: d382a4880b am: 77f1806491 am: 9c8e386d85 am: ac374fa2b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23088599

Change-Id: I80cdca32635accffba42947e0fbc23fb7394b0e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 12:58:51 +00:00
Jagrut Desai bd8a4276d4 Merge "Un-Split TaplTestsTaskbar" into udc-dev am: 53b4435b7e am: 7644472fa4 am: 22c8174392 am: d7f5282082
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22821856

Change-Id: I0d053891792657e8755190f21485866bb0e360cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 12:57:11 +00:00
Schneider Victor-tulias 6d5cf3c59d Merge "Fix tutorial menu layout issues" into udc-dev am: 458971616d am: 6a4bd3b6b5 am: 8fed7a9b1f am: 3520eea285
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23089641

Change-Id: Ibb5b06cf538052c5c03eec26ce1a2140ecc1c6c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 12:57:01 +00:00
Vinit Nayak 8227231dd8 Merge "Restore Recents TaskView based on all taskIDs, not first" into udc-dev am: 5f475a2f48 am: 5fd826d4d2 am: e0b0c18b46 am: dfce80f064
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22998399

Change-Id: I5afdb5ddbd6b8d8c1ceef9872baa7cf25dade7ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 12:56:45 +00:00