Commit Graph

69483 Commits

Author SHA1 Message Date
Treehugger Robot 2d7dc5e443 Merge "launcher3: add missing whitespace to log" into main 2023-07-19 17:39:46 +00:00
Liran Binyamin 51a4453f60 Merge "Check that a bubble exists before reordering it" into udc-qpr-dev am: 0706a81907 am: 85bfb4fa90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24119403

Change-Id: I32e147765ca617be9ec725939b6547f1c7791bd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-19 15:29:39 +00:00
Cameron Brown 089094ab40 launcher3: add missing whitespace to log
Change-Id: Ia3f4ec3bd46647eb3e0ee5a3a5e38d748a8ae02b
2023-07-19 15:08:48 +00: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
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
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
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
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
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 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
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