Commit Graph

15721 Commits

Author SHA1 Message Date
Winson Chung ad5fd07c0a Merge "Add null check for invalid previously appeared target" into udc-qpr-dev am: 6eb4af3f45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24155255

Change-Id: I63893b02fed24f91672fd9e843e0136f9d804d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 16:36:18 +00:00
Winson Chung 6eb4af3f45 Merge "Add null check for invalid previously appeared target" into udc-qpr-dev 2023-07-21 16:11:54 +00:00
Brian Isganitis a1a2b6beed Merge changes from topics "taskbar-search-back", "taskbar-search-transition" into udc-qpr-dev am: 5cc62b13ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24024257

Change-Id: I24d1dd1ebefbe2c2a7ea4d50aec3e17d7d3c4a48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 01:09:39 +00:00
Brian Isganitis c3ad647a4f Notify Taskbar search session of All Apps transitions. am: c90df24e1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24024253

Change-Id: I84b68eb4933b575b84e00d1b39ceb3ea0e5e71ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-21 01:09:35 +00:00
Vinit Nayak 5ad13e3412 Add null check for invalid previously appeared target
* In ag/23680185, a null check was removed that was
checking if individual mLastAppearedTaskTargets were null;
we check if the array overall is null, but individual
elements can also be null, ex 3P launcher

Bug: 289609734
Test: Repro steps from b/289609734 don't cause crash
Flag: none
Change-Id: Iddfde6d9ac2b708380b70b5fb6301b629506619c
2023-07-20 17:45:54 -07:00
Brian Isganitis 5cc62b13ee Merge changes from topics "taskbar-search-back", "taskbar-search-transition" into udc-qpr-dev
* changes:
  Support system back in Taskbar search session.
  Notify Taskbar search session of All Apps transitions.
2023-07-21 00:14:04 +00:00
Vinit Nayak da10e5472a Merge "Change split toast exit asset to "X"" into udc-qpr-dev am: 306c6e843f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24110227

Change-Id: I4c52f02a27d25a814103288c3cf077dba1f2ef73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 23:15:29 +00:00
Vinit Nayak 306c6e843f Merge "Change split toast exit asset to "X"" into udc-qpr-dev 2023-07-20 22:58:17 +00:00
Helen Cheuk 998ab43d99 Merge "Re-land "Add hover state border to overview task item"" into udc-qpr-dev am: 1d383a7f41
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24059774

Change-Id: I90642b81767ed9a9eeb9f628b7c6f223f6af735e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 22:39:05 +00:00
Helen Cheuk 1d383a7f41 Merge "Re-land "Add hover state border to overview task item"" into udc-qpr-dev 2023-07-20 22:02:39 +00:00
Fengjiang Li 3ff869be8f Merge "Log appear animation's scale factor" into udc-qpr-dev am: bebcaaae19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24119210

Change-Id: I873c663fe8378fe8942096652092eabb90bd78d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 21:26:55 +00:00
Fengjiang Li bebcaaae19 Merge "Log appear animation's scale factor" into udc-qpr-dev 2023-07-20 21:02:42 +00:00
Brian Isganitis 67de6365b5 Support system back in Taskbar search session.
Bug: 290820102
Test: Manual
Flag: ENABLE_ALL_APPS_SEARCH_IN_TASKBAR
Change-Id: If56b70cdad85a805ff5191b9c95e7c1939d394e9
2023-07-20 14:54:16 -04:00
Fengjiang Li da718e9749 Log appear animation's scale factor
Test: Grabbed a bug report b/291974797
Flag: N/A
Bug: 290320302
Change-Id: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf
2023-07-20 11:08:14 -07:00
Brian Isganitis c90df24e1c Notify Taskbar search session of All Apps transitions.
Test: Manual
Bug: 290819902
Flag: ENABLE_ALL_APPS_SEARCH_IN_TASKBAR
Change-Id: I9ff5ec7d55c33f9987aec79ebae31c38c710a920
2023-07-20 13:41:14 -04:00
helencheuk 27f23c7a35 Re-land "Add hover state border to overview task item"
Fix: 249859410
Test: b/291266459
Change-Id: I5ac1e9e77439e587f11c994d22fdc72d20d8502d
2023-07-20 18:35:22 +01:00
Sunny Goyal 4a6d92416c Merge "Fixing ViewCaptureRule not unregistered if activity is destroyed" into udc-qpr-dev am: 6df6cd2244
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24138143

Change-Id: Idd3cc3c95bd5865d2652586ca96e1b1d2e9fa07d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 16:54:16 +00:00
Liran Binyamin 94c4f5ce79 Merge "Handle the event of first bubble added." into udc-qpr-dev am: 00f2405995
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24105329

Change-Id: I87834b6e6e794a175859828acb290f6e2cf2da46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-20 16:54:02 +00:00
Sunny Goyal 6df6cd2244 Merge "Fixing ViewCaptureRule not unregistered if activity is destroyed" into udc-qpr-dev 2023-07-20 16:36:49 +00:00
Liran Binyamin 00f2405995 Merge "Handle the event of first bubble added." into udc-qpr-dev 2023-07-20 15:20:54 +00:00
Anushree Ganjam 935e03400e Merge "Implement ImpressionLogging v2." into udc-qpr-dev am: 4cd4ed090e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24016221

Change-Id: I5d0c6b19dcaaac32b9470a9f0d7b9559532f5f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 23:37:43 +00:00
Anushree Ganjam 4cd4ed090e Merge "Implement ImpressionLogging v2." into udc-qpr-dev 2023-07-19 23:17:10 +00:00
Sunny Goyal bb50f3cd8e Fixing ViewCaptureRule not unregistered if activity is destroyed
Bug: 291638593
Test: Presubmit
Flag: N/A
Change-Id: I86daf9fac210340b037d376d882ac5872c596ae4
2023-07-19 16:14:47 -07:00
Vinit Nayak 769e39b0ce Merge changes Ib1728d85,Ia5683a28 into udc-qpr-dev am: 45c11ade08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24122626

Change-Id: Id21625d485eb1a96a90bf478d9eb5d155990f9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 21:25:51 +00:00
Liran Binyamin 60240207bb Handle the event of first bubble added.
When the first bubble is added we set the visibility of the bubble bar
to VISIBLE if the stash controller is unstashed. The issue is that once
bubbles are gone we no longer update the stash state in the controller,
so it becomes stale and can't be used when the first bubble is added.

This change introduces a new method for handling the transition from
the state where both bar and handle are invisible into the state where
one of them becomes visible. We can't use the existing stashBubbleBar
and showBubbleBar methods because those transition from one to the other.
Using them when both are invisible results in one of them becoming visible
and then invisible again.

Fixes: 290992144
Fixes: 291074646

Test: Manual:
       - Add bubble in the test app by double-tapping on a chat (non expanding notification)
       - Observe that the handle becomes visible and the bar is invisible
       - Dismiss bubble
       - Add bubble in the test app by tapping on the button on the right (auto expanding)
       - Observe that the bar becomes visible and expanded
Change-Id: I61334c67c255a6ed074fa8c834f4a5a1547539bf
2023-07-19 17:02:57 -04:00
Vinit Nayak 45c11ade08 Merge changes Ib1728d85,Ia5683a28 into udc-qpr-dev
* changes:
  Add test logs for animating in split launch
  Add granular transition names for launching split
2023-07-19 20:56:30 +00:00
Pat Manning c80ec22cb1 Merge "Sends user home when stashed taskbar handle is clicked." into udc-qpr-dev am: d35d630745
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23728944

Change-Id: I85c33fbae2e70e5b8576e7345bbea60f62ba246a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 18:30:15 +00:00
Jeremy Sim 9440f98af2 Merge "Fix order invariance when checking for GroupedTaskViews" into udc-qpr-dev am: 6779101b26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24120730

Change-Id: Idb1f730af891f6c6089571c9298463ddf648dd8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 18:29:54 +00:00
Pat Manning d35d630745 Merge "Sends user home when stashed taskbar handle is clicked." into udc-qpr-dev 2023-07-19 18:24:06 +00:00
Jeremy Sim 6779101b26 Merge "Fix order invariance when checking for GroupedTaskViews" into udc-qpr-dev 2023-07-19 18:13:35 +00:00
Jeremy Sim ca4c321ffe Fix order invariance when checking for GroupedTaskViews
This patch makes it so that Overview will return the correct GroupedTaskView even when the set of taskIds passed in is in the opposite order.

Previously, we didn't account for order variation when checking for a GroupedTaskView, which would cause bugs when the GroupedTaskView had had its ordering swapped.

Fixed by modifying getTaskViewByTaskIds() to return true even if the order of ids was swapped.

Fixes: 290135090
Test: Manual
Change-Id: I2d94fadfee3cd478801b25cdbc699295179c8bd1
2023-07-19 11:06:34 -07:00
Liran Binyamin 85bfb4fa90 Merge "Check that a bubble exists before reordering it" into udc-qpr-dev am: 0706a81907
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24119403

Change-Id: I0cba344c8834f1cf3c2e9a172b38bb1255c5534f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 14:46:37 +00:00
Liran Binyamin 0706a81907 Merge "Check that a bubble exists before reordering it" into udc-qpr-dev 2023-07-19 13:39:55 +00:00
Vinit Nayak 3d293c432a Add test logs for animating in split launch
Bug: 288939273
Change-Id: Ib1728d859f33fa3f673f67eca754ec9813b0562b
2023-07-18 17:19:29 -07:00
Vinit Nayak 993c311bb7 Add granular transition names for launching split
Bug: 288939273
Test: Compiles
Flag: None
Change-Id: Ia5683a281786901a41fc1c6dba1bca408410910a
2023-07-18 17:19:29 -07:00
Anushree Ganjam a9645535b8 Implement ImpressionLogging v2.
Deprecate V1 implementation and keep only V2.

Bug: 285964742
Test: Manual
Flag: NA

Change-Id: If27f02f7142abf7960f74252d1e46bcd8c5b5e2a
2023-07-18 21:56:28 +00:00
Liran Binyamin 36325fd9d7 Check that a bubble exists before reordering it
This avoids re-adding bubbles that have already been removed
after dismissing multiple bubbles at once.

Fixes: 291738088
Test: Manual
      - Add 2 bubbles A and B to the bubble bar
      - Expand the bubble bar
      - Tap 3 dot menu and dismiss
      - Repeat for the next bubble
      - Observe that bubble bar is gone
      - Add a new bubble C
      - Observe that the bubble bar contains only bubble C
Change-Id: Id53811a103d245647489ab8d442cbb2004e0e700
2023-07-18 15:42:56 -04:00
Vinit Nayak 78207fd80b Change split toast exit asset to "X"
* TODO: Probably need to change tint based on theme

Bug: 276361926
Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE
Test: Shows up as expected
Change-Id: I28a2eefa115cb15aab560d750103c7946639c18b
2023-07-17 20:19:16 -07:00
Vinit Nayak 3ae98b4507 Merge "Keep track of multiple TasksIDs and Targets in GestureState" into udc-qpr-dev am: 80fddb6e40
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23680185

Change-Id: I9fdab12585372479545ef431a85548e872200115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 03:18:27 +00:00
Vinit Nayak 80fddb6e40 Merge "Keep track of multiple TasksIDs and Targets in GestureState" into udc-qpr-dev 2023-07-18 02:47:39 +00:00
Vinit Nayak 0a4e37506e Merge "Show split select instructions toast when starting split on workspace" into udc-qpr-dev am: b9a5c4551f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24062180

Change-Id: Ifac48dc2f1cbf06506ec4c59003e2224aba060ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 22:35:37 +00:00
Schneider Victor-tulias 78d0cdde1f Merge "Fix null pointer in createRecentsWindowAnimator." into udc-qpr-dev am: 5c825f4cda
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056554

Change-Id: I5be8df549f9b476fb65bedf55dee0e2ae5d7f012
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 22:34:15 +00:00
Vinit Nayak b9a5c4551f Merge "Show split select instructions toast when starting split on workspace" into udc-qpr-dev 2023-07-17 22:11:36 +00:00
Schneider Victor-tulias 5c825f4cda Merge "Fix null pointer in createRecentsWindowAnimator." into udc-qpr-dev 2023-07-17 21:43:12 +00:00
Vinit Nayak e7e7a6e522 Keep track of multiple TasksIDs and Targets in GestureState
* Quickswitching between fullscreen and split tasks breaks split,
need that to be fixed to further test these code changes

Bug: 236226779
Change-Id: I332ad6e2d98760ec1d691dae76e8e3ab8b839c75
2023-07-17 14:37:06 -07:00
Alex Chau bd0269207f Merge "Clean-up b/260135164 logs" into udc-qpr-dev am: 7d89646585
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24058374

Change-Id: I859fc1a2652070b5bdea3de55a9910cacb5b0933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 19:35:25 +00:00
Alex Chau 7d89646585 Merge "Clean-up b/260135164 logs" into udc-qpr-dev 2023-07-17 18:32:46 +00:00
Brian Isganitis 22bc9983ed Merge "Initial Taskbar drag-n-drop support for search results." into udc-qpr-dev am: 3f0e7e7c5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24011563

Change-Id: I6838291da55f690898946094c5a6e8ece27a4d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 17:38:02 +00:00
Brian Isganitis 3f0e7e7c5d Merge "Initial Taskbar drag-n-drop support for search results." into udc-qpr-dev 2023-07-17 17:08:15 +00:00
Alex Chau 625709617e Clean-up b/260135164 logs
Fix: 271242509
Test: manual
Change-Id: I2c5421539f8f70897b142dfdaa6bc97a10225309
2023-07-17 15:30:31 +01:00