Commit Graph

78507 Commits

Author SHA1 Message Date
Federico Baron fe545acab0 Merge "[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf" into udc-qpr-dev am: 88d29a16cc am: 0b6966d047
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24104040

Change-Id: I7a2321304ddb2a9630b8f8ea48c4ccafe51a366c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 00:30:05 +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
Federico Baron 0b6966d047 Merge "[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf" into udc-qpr-dev am: 88d29a16cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24104040

Change-Id: I101b2a66680b95cbe73e3eeb44958fe7eefc62c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:45:08 +00:00
Federico Baron 7a5e24ead9 Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 893c0fddac am: 28b54fcc10 am: af61f8e5e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558

Change-Id: I0bd5156981393a782c5f310e3b900e1627ba96dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:24:49 +00:00
Treehugger Robot 7672efe225 Merge "[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf am: 9b77c7a59d" into udc-qpr-dev-plus-aosp am: 63fa5cdf15
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24105195

Change-Id: I54ae67850f1077f611bee59cb6ed017b5717eb2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:22:42 +00:00
Android Build Coastguard Worker aa84e2118e Snap for 10515480 from 80fddb6e40 to udc-qpr1-release
Change-Id: I498b2ba1a9c3aaf63d797df18cfbf6652ece7868
2023-07-18 23:18:59 +00:00
Federico Baron af61f8e5e0 Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 893c0fddac am: 28b54fcc10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558

Change-Id: I0c96071f0650be3aeb8f50f87853fbbeb325f6c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 23:02:03 +00:00
Federico Baron 88d29a16cc Merge "[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf" into udc-qpr-dev 2023-07-18 22:50:47 +00:00
Treehugger Robot 63fa5cdf15 Merge "[conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf am: 9b77c7a59d" into udc-qpr-dev-plus-aosp 2023-07-18 22:49:54 +00:00
Vinit Nayak 4351d50609 Use gesture instead of stateManager to go to AllApps
* Hypothesis for why ALL_APPS isn't showing is that
directly navigating to it via state manager might have
some more hiccups (historically it has), so we do it
now via swiping up on workspace

Bug: 288152874
Flag: None
Test: Passes locally
Change-Id: I8ada7d3bde88fa54c9aab84012a9b0e3e045069e
2023-07-18 15:45:42 -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
Fengjiang Li bafbdfbfd6 Fix bug where all apps rv preinfaltion is not enabled when work profile is disabled
When work profile is disabled, we should also let main RV use AllAppsStore's recycler view pool.

Test: Turn off work profile, kill launcher process, swipe up all apps, start record perfetto trace, scroll down all apps, then stop record, verify no BubbleTextView inflation after change
Bug: 287523421
Flags: ENABLE_ALL_APPS_RV_PREINFLATION
Change-Id: Idd5f8193e85fc2a250877affc3b2e4ab4a704797
2023-07-18 14:05:36 -07:00
Brian Isganitis 854c341603 Merge "Have OptionsPopupView depend on ActivityContext." into udc-qpr-dev am: 210e000272 am: b026b75b4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24103828

Change-Id: I90913321dd207c6bc4395ff4a4601a601c948b13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 20:12:03 +00:00
Brian Isganitis b026b75b4b Merge "Have OptionsPopupView depend on ActivityContext." into udc-qpr-dev am: 210e000272
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24103828

Change-Id: I3964d3f4ffbef837fc667b0f90a055b3d05e38c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 19:51:30 +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
Brian Isganitis 210e000272 Merge "Have OptionsPopupView depend on ActivityContext." into udc-qpr-dev 2023-07-18 19:01:51 +00:00
Bill Yi 1b0e9ee832 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If16db1f2f982ce5d0201ea56cd4c22b0d8a8a9c8
2023-07-18 11:56:56 -07:00
Bill Yi 31855be8d4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3dc01f06b2302cea0b5435a745e0e96c8a465bea
2023-07-18 11:56:05 -07:00
Jordan Silva 8bd7af2b3f Improving responsive grid xml parser
Refactors AllAppsSpecs, FolderSpecs and WorkspaceSpecs initialization to use the same code to parse the xml with different map function. This CL improves the readability of the code and remove code duplication.

Fix: 286538013
Flag: ENABLE_RESPONSIVE_WORKSPACE
Test: AllAppsSpecsTes
Test: CalculatedAllAppsSpecTest
Test: CalculatedFolderSpecsTest
Test: CalculatedWorkspaceSpecTest
Test: FolderSpecsTest
Test: WorkspaceSpecsTest
Test: DeviceProfileResponsiveDumpTest
Test: DeviceProfileResponsiveAlternativeDisplaysDumpTest
Change-Id: Iec5863619399efd2e80f3db46b75c4d785e1656f
2023-07-18 18:03:16 +01:00
Android Build Coastguard Worker a31ca81d53 [coastguard skipped] Merge sparse cherrypicks from sparse-10502572-L39700000962039696 into udc-release.
COASTGUARD_SKIP: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
COASTGUARD_SKIP: I38720247bf3f5ca08e59bcc570558e456c88c411

Change-Id: I40c5312a682bc2800e6cc6f5a6d2bcc3cf0eac16
2023-07-18 16:59:10 +00:00
Android Build Coastguard Worker 89d4949311 Merge cherrypicks of ['googleplex-android-review.googlesource.com/24056558'] into sparse-10502572-L39700000962039696.
SPARSE_CHANGE: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f

Change-Id: I38720247bf3f5ca08e59bcc570558e456c88c411
2023-07-18 16:49:52 +00:00
fbaron 8a18bc0f12 Fix inability to remove or interact with folder when removing 2nd item from folder
Fix: 289960317
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon out of folder lets you open the app that remains where the folder was
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon into remove droptarget removes the folder and turns it into a single clickable icon
flag: no flag
(cherry picked from commit 5a7ea3069b)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:326ec97ab6a4d348708830cd2860d4dd90a59039)
Merged-In: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
Change-Id: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
2023-07-18 16:49:12 +00:00
Android Build Coastguard Worker e126440f8b Merge cherrypicks of ['googleplex-android-review.googlesource.com/24056558'] into udc-release.
Change-Id: Ibee4cd36f6f40b94108e3bfeec99afd25265f4cd
2023-07-18 04:35:53 +00:00
fbaron faf861aae5 Fix inability to remove or interact with folder when removing 2nd item from folder
Fix: 289960317
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon out of folder lets you open the app that remains where the folder was
Test: Verify in unfolded felix that going from 2 icon folder and dragging 2nd icon into remove droptarget removes the folder and turns it into a single clickable icon
flag: no flag
(cherry picked from commit 5a7ea3069b)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:326ec97ab6a4d348708830cd2860d4dd90a59039)
Merged-In: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
Change-Id: I26138ee9f8e7cdb45cafe2446dc4d1e3d6d8347f
2023-07-18 04:32:08 +00:00
Vinit Nayak 7027f334cb Merge "Keep track of multiple TasksIDs and Targets in GestureState" into udc-qpr-dev am: 80fddb6e40 am: 3ae98b4507
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23680185

Change-Id: Id66d6c87c2ace41a8fe05ba9bc47ad56f396dc69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18 04:08:50 +00: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
Anushree Ganjam 660679f91f Introduce onAnimateToSearchStateCompleted() in SearchUiDelegate.
This will be called when transition animation to search is completed.

Bug: 285166099
Flag: NA
Test: Manual
Change-Id: I69e594cbf3564a866d258654fc23a00410e7deab
2023-07-18 02:16:42 +00:00
Android Build Coastguard Worker b35875259a Snap for 10509334 from 7d89646585 to udc-qpr1-release
Change-Id: I5a8f2cbe39432cad35a985f7e381673daa6f16ba
2023-07-17 23:20:23 +00:00
Federico Baron 50c457b626 [conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf am: 9b77c7a59d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558
Change-Id: Iae3c6f33226c47694927454915b342f6e9c0fa05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 23:16:34 +00:00
Federico Baron 312127c161 [conflict] Merge "Fix inability to remove or interact with folder when removing 2nd item from folder" into udc-dev am: 8002897694 am: 96e03b3edf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24056558
Change-Id: I746dcd40e2e57f5bb533de01a0b0d47c5c0e409e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 23:16:03 +00:00
Vinit Nayak f5ea7390dc Merge "Show split select instructions toast when starting split on workspace" into udc-qpr-dev am: b9a5c4551f am: 0a4e37506e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24062180

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

Change-Id: I431666b003b90c65421a18194a856a9c66d1af7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 23:15:19 +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
Alex Chau 1cdf7a72e6 Merge "Clean-up b/260135164 logs" into udc-qpr-dev am: 7d89646585 am: bd0269207f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24058374

Change-Id: Ib8c8cc222924e43f35945c8dfb3e47656af9479e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:59:23 +00:00
Brian Isganitis 7913080166 Merge "Initial Taskbar drag-n-drop support for search results." into udc-qpr-dev am: 3f0e7e7c5d am: 22bc9983ed
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24011563

Change-Id: I58e7edc548d4691bcc912579f4c5778e8f59685e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:55:14 +00:00
Sunny Goyal e797f7f0eb Merge "Removing LauncherActivityRule as it can be flaky based on when the rule was initialized" into udc-qpr-dev am: cd5d3d0c31 am: 43364a14b1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24065401

Change-Id: Ic98204f59df48f3544054b65a8ef591a9c5be5b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:54:57 +00:00
Pat Manning 73f0772669 Merge "Show tooltips on cursor hover of taskbar icons." into udc-qpr-dev am: f351e515f7 am: f2aa70c477
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23369318

Change-Id: I3a15b72ec49c4c6e22fda6ba9c61bed7338c428a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:54:43 +00:00
Fengjiang Li 576f64a0b1 Merge "Handle nullable CellLayout when removing app icon from folder" into udc-qpr-dev am: ccd49005c9 am: ebac5e9dfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24044953

Change-Id: Ic88346e41c151291e21b582acfa9388444d99e21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:54:31 +00:00
Sebastián Franco 82402f3f84 Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: c0b3e59990 am: 2a623484f5 am: 283d8031a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456

Change-Id: Id2542949942cfad6b5abeba1addbe36d621d5f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:54:20 +00:00
Sebastián Franco e9dc6ab782 Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: add37239db am: 95f8e8f465 am: eedec5194b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456

Change-Id: I4b0a23a3cc8e3559f8386be42ff5c05590de2dd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:54:10 +00:00
Sebastián Franco c361e9cd7a Merge "Creating a correctly populated mOccupied grid when reordering on foldables" into udc-dev am: be4a43c1d9 am: add37239db am: 61ef65582d am: 0ba758cd87
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24060456

Change-Id: Idd60b769049ab3fa0c99ca38b4d0043da7931a3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:53:59 +00:00
TreeHugger Robot d22aebd2af Merge "Clean up SplitData refactor flag" into udc-qpr-dev am: 61c2bbe5b8 am: 42064106ba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24082168

Change-Id: I93fc98cdf01c25de263fc38fbc8402b39f884993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:53:45 +00:00
TreeHugger Robot 2755e96e7f Merge "Exposing the layout URI builder method, so that it can be used in tests" into udc-qpr-dev am: ef52e37e5f am: 224f7360f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24083957

Change-Id: I275b9827a530d92b37d5ed356707ff3b5ebe83ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 21:53:33 +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