Commit Graph

64587 Commits

Author SHA1 Message Date
Federico Baron
bc9e67c3bd Merge "Fix padding/margin for widgets in widgetpicker" into udc-qpr-dev am: 522665d2a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23752205

Change-Id: I37d6cdaf25528b7afdbb6f178c2f201191b06d85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 20:35:29 +00:00
Federico Baron
4848f89ad4 Merge "Revert "Fix padding/margin for widgets in widgetpicker"" into udc-qpr-dev am: c37899ecbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23752204

Change-Id: Id7e1bd4b5810692a5f496cd792e70b8813bb60e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 20:35:26 +00:00
Federico Baron
522665d2a4 Merge "Fix padding/margin for widgets in widgetpicker" into udc-qpr-dev 2023-06-21 19:57:17 +00:00
Federico Baron
c37899ecbd Merge "Revert "Fix padding/margin for widgets in widgetpicker"" into udc-qpr-dev 2023-06-21 19:57:17 +00:00
Vinit Nayak
44a5235145 Merge "Allow starting split from home, selecting second app from overview" into udc-qpr-dev am: aa17ce6274
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23679274

Change-Id: Iea052ebb33190bbf20b9ae8321e4f49bc19af152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 18:27:39 +00:00
Vinit Nayak
aa17ce6274 Merge "Allow starting split from home, selecting second app from overview" into udc-qpr-dev 2023-06-21 18:24:09 +00:00
Winson Chung
42cc3aeca5 Merge "Restore specific colors for floating rotation button" into udc-dev am: d827387ffd am: 5c03116eb3 am: aa4a56aaa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23755143

Change-Id: Ieb70f55a079d3b66c2ed6c8e158eb100e9b91f96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 18:22:46 +00:00
Winson Chung
fa74a638e7 Merge "Restore specific colors for floating rotation button" into udc-dev am: d827387ffd am: f738809ffa am: d0e0dacaa0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23755143

Change-Id: I303a8d1ff124837442ecf930d2b0469cb98c0232
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 18:11:07 +00:00
Winson Chung
a63f77b4aa Merge "Restore specific colors for floating rotation button" into udc-dev am: d827387ffd am: 5c03116eb3 am: b7aa820f57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23755143

Change-Id: I061d050f013a6c46e8f9b371fe37ad8b9af10bb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 18:10:16 +00:00
Winson Chung
d0e0dacaa0 Merge "Restore specific colors for floating rotation button" into udc-dev am: d827387ffd am: f738809ffa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23755143

Change-Id: Id061010d693ccf962fae5205da09b599f3426ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 17:30:57 +00:00
Winson Chung
aa4a56aaa1 Merge "Restore specific colors for floating rotation button" into udc-dev am: d827387ffd am: 5c03116eb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23755143

Change-Id: I0c066b9cba339bf16ae2215cbb527c5e3038a03e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 17:30:02 +00:00
Winson Chung
b7aa820f57 Merge "Restore specific colors for floating rotation button" into udc-dev am: d827387ffd am: 5c03116eb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23755143

Change-Id: I4f108a3b4ee98dcf8236802eb7cf88b1cdd8cdaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 17:25:45 +00:00
Winson Chung
5c03116eb3 Merge "Restore specific colors for floating rotation button" into udc-dev am: d827387ffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23755143

Change-Id: I8d21b03dfec3522d92d6e4b728de76ad99e01371
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 16:47:23 +00:00
Winson Chung
f738809ffa Merge "Restore specific colors for floating rotation button" into udc-dev am: d827387ffd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23755143

Change-Id: I393367d085177514884534f1750b639d84109e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 16:42:47 +00:00
Winson Chung
d827387ffd Merge "Restore specific colors for floating rotation button" into udc-dev 2023-06-21 16:06:19 +00:00
Jordan Silva
7b2c02f12e Merge "Update DeviceProfile to calculate responsive grid for folders" into udc-qpr-dev am: 54cfc5ea04
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23658954

Change-Id: I1ede028ee900b114aa1b840e3b872be1222678a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 14:57:49 +00:00
Jordan Silva
54cfc5ea04 Merge "Update DeviceProfile to calculate responsive grid for folders" into udc-qpr-dev 2023-06-21 14:28:02 +00:00
Treehugger Robot
9dce9a5e25 Merge "Add detailed exception for snappedIndex == -1 when dismissing tasks" into udc-dev am: dcbe9583fb am: 143e612bc4 am: 41cbb5bc88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23535540

Change-Id: I61d816d4b57831b42300a8ea6e9cff187ce511b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 13:12:30 +00:00
Treehugger Robot
173b8444d0 Merge "Add detailed exception for snappedIndex == -1 when dismissing tasks" into udc-dev am: dcbe9583fb am: 6d9c599521 am: 2d0c36576c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23535540

Change-Id: I6ddb97c5c09c225ed277df3ecc055addd069ddae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 13:07:29 +00:00
Treehugger Robot
7a3495b3cc Merge "Add detailed exception for snappedIndex == -1 when dismissing tasks" into udc-dev am: dcbe9583fb am: 143e612bc4 am: 5fe0640d64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23535540

Change-Id: I64af9762dc6809db6f0bef8b79f5781576950aab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 13:07:07 +00:00
Treehugger Robot
2d0c36576c Merge "Add detailed exception for snappedIndex == -1 when dismissing tasks" into udc-dev am: dcbe9583fb am: 6d9c599521
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23535540

Change-Id: I94337b822649264e86f3e53cf74bed811b741249
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 12:30:30 +00:00
Treehugger Robot
41cbb5bc88 Merge "Add detailed exception for snappedIndex == -1 when dismissing tasks" into udc-dev am: dcbe9583fb am: 143e612bc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23535540

Change-Id: Ie51df96182b138aeda874960da8511eaefab1d15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 12:29:19 +00:00
Treehugger Robot
5fe0640d64 Merge "Add detailed exception for snappedIndex == -1 when dismissing tasks" into udc-dev am: dcbe9583fb am: 143e612bc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23535540

Change-Id: I2ade78b2e06bef1950b44b148cefd06159ec909d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 12:25:09 +00:00
Treehugger Robot
143e612bc4 Merge "Add detailed exception for snappedIndex == -1 when dismissing tasks" into udc-dev am: dcbe9583fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23535540

Change-Id: Id446aaa7fa907aaa4376b9d442f5bbc78a44298c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 11:47:17 +00:00
Treehugger Robot
6d9c599521 Merge "Add detailed exception for snappedIndex == -1 when dismissing tasks" into udc-dev am: dcbe9583fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23535540

Change-Id: If90845908b748ccc8a25eccb54a68a7964fb91f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 11:42:57 +00:00
Jordan Silva
637f4eb2f3 Update DeviceProfile to calculate responsive grid for folders
It uses the new responsive folder calculations and specs when responsive grid is enabled. The grid has to have folderSpecsId defined to use the new specifications, otherwise it will use the current scalable grid implementation.

Fix: 284155638
Test: DeviceProfileDumpTest
Test: ResponsiveHomeScreenFolderImageTest
Test: HomeScreenFolderImageTest
Flag: ENABLE_RESPONSIVE_WORKSPACE
Change-Id: I535cff4bb00e969f782447a898230fe2b2c05cc9
2023-06-21 12:18:58 +01:00
Treehugger Robot
dcbe9583fb Merge "Add detailed exception for snappedIndex == -1 when dismissing tasks" into udc-dev 2023-06-21 11:00:20 +00:00
Jordan Silva
ab04ddb59c Merge "Decrease icon size by steps" into udc-qpr-dev am: 03951ba556
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23563380

Change-Id: I58843eeaa4faa38f786e7841203e5e00c9f5ef29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 10:39:48 +00:00
Jordan Silva
03951ba556 Merge "Decrease icon size by steps" into udc-qpr-dev 2023-06-21 10:12:30 +00:00
Treehugger Robot
1841a37bee Merge "Simplifying taskbar recreation logic" into udc-qpr-dev am: ca533b1254
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23703457

Change-Id: Iff7cb3519b86e4199303cde76d869801c627d94f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 09:09:27 +00:00
Treehugger Robot
ca533b1254 Merge "Simplifying taskbar recreation logic" into udc-qpr-dev 2023-06-21 08:15:10 +00:00
Treehugger Robot
9579a2049a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a842561c1b -s ours am: 707af99414 -s ours am: 5fc34e1c80 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89e75cca8398d93215215a2f6e87679dd5adbe5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:40:25 +00:00
Bill Yi
eb578f570a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d701913d9 -s ours am: 370cb7e9b7 -s ours am: 6e44012fe2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89833cfc9de6ba9352fb355598e1d40b131b6221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:40:14 +00:00
Bill Yi
08bf20a9fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5204db1fa2 -s ours am: f794c1f5bd -s ours am: 92ade8de8b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia841a0a12b6f089fe84a12bf8db434e4cb6b8646
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:39:57 +00:00
Automerger Merge Worker
c59be095d4 Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into udc-d1-dev-plus-aosp am: c80b23009d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23756720

Change-Id: I478d858aceb4adcbaa1a0cfee92919158902fc46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:16:45 +00:00
Treehugger Robot
b5fc2ca2bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a842561c1b -s ours am: 248b636ac9 -s ours am: 3fba0c9468 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84507ee53df3870a890dcd71cdbeac388a67371c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:16:31 +00:00
Treehugger Robot
3c9b42812c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a842561c1b -s ours am: 707af99414 -s ours am: 855dcb4da7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3a82410dad9985762bf93580cb6d7c336260a066
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:13:16 +00:00
Bill Yi
9cc4031f16 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d701913d9 -s ours am: 370cb7e9b7 -s ours am: 3e73d97422 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d908778fbed0fe3c22c2ea85966e22d5154e926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:13:05 +00:00
Bill Yi
c6122be024 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5204db1fa2 -s ours am: f794c1f5bd -s ours am: 1358cd749e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia30d5fc536941f451b328b631d634988e4b8d6e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 07:12:47 +00:00
Automerger Merge Worker
c80b23009d Merge changes from topic "am-69bbabe4aa46467eb85a40ee75080959" into udc-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a842561c1b -s ours am: 248b636ac9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d701913d9 -s ours am: b49b4ea563 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5204db1fa2 -s ours am: e768198239 -s ours
2023-06-21 06:55:06 +00:00
Treehugger Robot
3fba0c9468 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a842561c1b -s ours am: 248b636ac9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2171d669d4db427bdd1ce1c91ad2d8bc4884f0c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:53:58 +00:00
Treehugger Robot
5fc34e1c80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a842561c1b -s ours am: 707af99414 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09668c7f138989c732c0742bec4843003893af82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:53:53 +00:00
Bill Yi
3804f106cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d701913d9 -s ours am: b49b4ea563 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If23fd986b250ab3f00e8aa5e1a167f200d997f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:53:46 +00:00
Bill Yi
6e44012fe2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d701913d9 -s ours am: 370cb7e9b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ief4a39ce4923681f28f92bbabec3dd8ad763f368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:53:42 +00:00
Bill Yi
03aa8ea323 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5204db1fa2 -s ours am: e768198239 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib34e4dec6caa6a47693d3e5a862f0005c5faaaf2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:53:32 +00:00
Bill Yi
92ade8de8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5204db1fa2 -s ours am: f794c1f5bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5507f262a658b5311dbbd683dbead62b0cc22d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:53:24 +00:00
Treehugger Robot
855dcb4da7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a842561c1b -s ours am: 707af99414 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I085034fc64982fdd1cc8bef360381ee030ac1e6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:51:44 +00:00
Bill Yi
3e73d97422 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d701913d9 -s ours am: 370cb7e9b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3085ecaa1207591a74806957be9e0e8c9e88b036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:51:34 +00:00
Bill Yi
1358cd749e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5204db1fa2 -s ours am: f794c1f5bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I42ee5026121238d340312be15209836a5c8249bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:51:16 +00:00
Treehugger Robot
707af99414 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: a842561c1b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I71eb5e99e646ee80a14174f037b64563f1b782cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-21 06:37:22 +00:00