Commit Graph

76729 Commits

Author SHA1 Message Date
Liran Binyamin 0706a81907 Merge "Check that a bubble exists before reordering it" into udc-qpr-dev 2023-07-19 13:39:55 +00:00
Pat Manning 6a4e491da1 Prevent showing action button edu tooltip in grid only overview.
Fix: 291232225
Test: OverviewActionsControllerTest.
Flag: ENABLE_GRID_ONLY_OVERVIEW
Change-Id: I3d2881fea26ddfdda8540e3609733f6261e40458
2023-07-19 12:26:35 +01:00
Uwais Ashraf cc4ab7377c Revert "Adding some utility test rules"
Revert submission 23784831-launcher-test-rule

Reason for revert: Checking if these changes are the cause of a 10 min timeout in the instrumentation
Bug: 291171782
Reverted changes: /q/submissionid:23784831-launcher-test-rule

Change-Id: Id77ee089b8302992f3a5d91f35f655bb618137f0
2023-07-19 10:37:52 +00:00
Bill Yi 5268f4ffbd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 66cfe9bf4f -s ours am: 9c8423f708 -s ours am: 9bb81011fb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: I95576cc06b2886122ab576b6c57bedb8417042e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:55:41 +00:00
Bill Yi 7ddbef94b3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31855be8d4 -s ours am: 7afe35bc7d -s ours am: 182ed06d38 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: I98afc0ac71b17f11925ff160c12c8402e7d6b876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:55:31 +00:00
Bill Yi b47107e8ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b0e9ee832 -s ours am: 0addd94602 -s ours am: b470ad09b8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24115997

Change-Id: I8adc5c50b835a3b23c449327d40bb9be07b48daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:55:13 +00:00
Bill Yi 9bb81011fb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 66cfe9bf4f -s ours am: 9c8423f708 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: I13cd816b785e4b40eee623e72ab6ddb876a4f4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:44:28 +00:00
Bill Yi 182ed06d38 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31855be8d4 -s ours am: 7afe35bc7d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: I139af45cc1f608d46d6d9668fc34eac404680b8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:44:17 +00:00
Bill Yi b470ad09b8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b0e9ee832 -s ours am: 0addd94602 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24115997

Change-Id: I57fb4bf8fe133824446f56e4d71c807931b06e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:44:00 +00:00
Bill Yi 16a3530023 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 66cfe9bf4f -s ours am: d11bd3d2f8 -s ours am: 7ec3a0122b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: I45ba6386f5560fe2a9b643520d8882ce05cd7858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:39:10 +00:00
Bill Yi e0733affe1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31855be8d4 -s ours am: 1637756cbe -s ours am: f3b95c15ba -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: Ic6e85dab284e1725c6e8db90f28768b73f99c2cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:38:58 +00:00
Bill Yi 47618ee055 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b0e9ee832 -s ours am: 1386c58be0 -s ours am: b2ddc88f41 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24115997

Change-Id: Ibfd1aad7f9dd5627b203f17d50baba2913b3cc36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 03:38:43 +00:00
Bill Yi 7ec3a0122b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 66cfe9bf4f -s ours am: d11bd3d2f8 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: Ib22f9d505b6645a5b59e7132bc44071f8bac6ec8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:54:39 +00:00
Bill Yi f3b95c15ba [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31855be8d4 -s ours am: 1637756cbe -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: Ia1edfe4c0442242420af7709311b9550dcd058af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:54:27 +00:00
Bill Yi b2ddc88f41 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b0e9ee832 -s ours am: 1386c58be0 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24115997

Change-Id: I2f6177b4b21605fd68756eca79e213d6b4f93094
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:54:12 +00:00
Bill Yi 9c8423f708 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 66cfe9bf4f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: Ib87c3654ffd543971bc98cca9097cbae9207f6b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:39:59 +00:00
Bill Yi 7afe35bc7d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31855be8d4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: I14c414cfb0e75d9edee73953533fee89af3dcb7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:39:49 +00:00
Bill Yi 0addd94602 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b0e9ee832 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24115997

Change-Id: I11491dc58602725611e1d77ec8fd80d7bd92939d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:39:31 +00:00
Bill Yi d11bd3d2f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 66cfe9bf4f -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: I603f9c38d75b1be65c1bd82821f9cd3dd2cf758e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:34:49 +00:00
Bill Yi 1637756cbe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 31855be8d4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24117018

Change-Id: I8fa4436fd8af46762f0fc104a4d385e8eaa6bcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:34:36 +00:00
Bill Yi 1386c58be0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1b0e9ee832 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24115997

Change-Id: I07964b665f77d65d4d011d63874e13e962093f1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 02:34:22 +00:00
Bill Yi 66cfe9bf4f Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-07-19 02:06:05 +00:00
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