Commit Graph

48143 Commits

Author SHA1 Message Date
Jeremy Sim b2b0eb35ae Merge changes from topic "presubmit-am-66c2d088f05444b5984eb37e35ba24a0"
* changes:
  [automerge] Implement splitting from Taskbar long-press 2p: abdf25d226 2p: 5c638fdfbe
  [automerge] Implement splitting from Taskbar long-press 2p: abdf25d226
  Implement splitting from Taskbar long-press
2022-04-09 01:21:14 +00:00
Vinit Nayak bc764ce324 Merge "Revert "Animate overivew actions view hiding on scroll."" into tm-dev am: 9ef75227c0 am: afbc7e4cfe am: 499fef20c5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17661889

Change-Id: Ifcb578ff50bb77f252da2083bee88cffe96b2b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:59:44 +00:00
Thales Lima fcfa037e18 Merge "Revert "Making tablet grid scalable and tuning size"" into tm-dev am: b7d44d8c1a am: 4c3e2caaf2 am: 45620acb06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17656210

Change-Id: Iea45ce3feccb288769b7afbf86a81d6c55cd5d6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:59:35 +00:00
Vinit Nayak 499fef20c5 Merge "Revert "Animate overivew actions view hiding on scroll."" into tm-dev am: 9ef75227c0 am: afbc7e4cfe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17661889

Change-Id: Ia56d6d56251a48685aac113d9fd392eb2c872c99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:38:40 +00:00
Thales Lima 45620acb06 Merge "Revert "Making tablet grid scalable and tuning size"" into tm-dev am: b7d44d8c1a am: 4c3e2caaf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17656210

Change-Id: I247368955f5fd1c74dbf7a8c23273eb9b3a97bac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:38:18 +00:00
Vinit Nayak 5d2ca53340 Merge "Revert "Animate overivew actions view hiding on scroll."" into tm-dev am: 9ef75227c0 am: 23ac334383
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17661889

Change-Id: I3dea3a95fc9c069342f56bae3d91188d7c929a7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:22:20 +00:00
Thales Lima 13e6c1bf60 Merge "Revert "Making tablet grid scalable and tuning size"" into tm-dev am: b7d44d8c1a am: a6e093c5c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17656210

Change-Id: I1c9a38f51361cd2e7d6a87897ef01f3266712502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:22:11 +00:00
Vinit Nayak 23ac334383 Merge "Revert "Animate overivew actions view hiding on scroll."" into tm-dev am: 9ef75227c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17661889

Change-Id: I4927db4443fc8fa01784fd233d1af7cfec849615
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:15:29 +00:00
Vinit Nayak afbc7e4cfe Merge "Revert "Animate overivew actions view hiding on scroll."" into tm-dev am: 9ef75227c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17661889

Change-Id: Ie2d7d284f71bbe88d1e92008cc72fef880887c3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:15:16 +00:00
Thales Lima a6e093c5c1 Merge "Revert "Making tablet grid scalable and tuning size"" into tm-dev am: b7d44d8c1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17656210

Change-Id: Id730639b5f993b24e2d9350a4187ac48dc00961a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:15:11 +00:00
Thales Lima 4c3e2caaf2 Merge "Revert "Making tablet grid scalable and tuning size"" into tm-dev am: b7d44d8c1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17656210

Change-Id: If255b8ce1e4d3f2d9c0f4284a84ff702cebb23d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:13:52 +00:00
Vinit Nayak 62d0609da6 Merge changes from topic "presubmit-am-65236292503c47e89824f0dfda012d6a" into tm-mainline-prod am: 6d9f02efb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17661889

Change-Id: I9dfa7100fc242b47bc54a16b8500a361d40dd831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:13:52 +00:00
Thales Lima d62844af5e Merge changes from topic "revert-17607211-aosp_tablet_tune-LBHOYHXCMR" into tm-mainline-prod am: d5d551f094
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17656210

Change-Id: I7a65986736a35ec42fdc719dcf251d073903d127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 22:13:31 +00:00
Vinit Nayak 9ef75227c0 Merge "Revert "Animate overivew actions view hiding on scroll."" into tm-dev 2022-04-08 22:12:46 +00:00
Vinit Nayak 6d9f02efb7 Merge changes from topic "presubmit-am-65236292503c47e89824f0dfda012d6a" into tm-mainline-prod
* changes:
  [automerge] Revert "Animate overivew actions view hiding on scroll." 2p: f5f14acba3
  Revert "Animate overivew actions view hiding on scroll."
2022-04-08 22:12:46 +00:00
Thales Lima b7d44d8c1a Merge "Revert "Making tablet grid scalable and tuning size"" into tm-dev 2022-04-08 21:52:55 +00:00
Thales Lima a700314f54 Merge changes from topic "revert-17607211-aosp_tablet_tune-LBHOYHXCMR"
* changes:
  [automerge] Revert "Making tablet grid scalable and tuning size" 2p: 4ea95b7fd8 2p: 549c204eb3
  [automerge] Revert "Making tablet grid scalable and tuning size" 2p: 4ea95b7fd8
  Revert "Making tablet grid scalable and tuning size"
2022-04-08 21:52:55 +00:00
Thales Lima d5d551f094 Merge changes from topic "revert-17607211-aosp_tablet_tune-LBHOYHXCMR" into tm-mainline-prod
* changes:
  [automerge] Revert "Making tablet grid scalable and tuning size" 2p: 4ea95b7fd8
  Revert "Making tablet grid scalable and tuning size"
2022-04-08 21:52:55 +00:00
Shikha Malhotra e813224a06 Merge "Added provision to switch the PageIndicator in specific Launchers" into tm-dev am: 6d6f62c462 am: 89be01f39b am: 00c46fada0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17399997

Change-Id: Ia5029cf1a014cc99a46ee27ac3d71efda319f7c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 21:36:04 +00:00
Shikha Malhotra 00c46fada0 Merge "Added provision to switch the PageIndicator in specific Launchers" into tm-dev am: 6d6f62c462 am: 89be01f39b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17399997

Change-Id: I1852aa16d1acc9ff288422f3fa34e5fccd599b77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 21:22:41 +00:00
Shikha Malhotra 3041935e45 Merge "Added provision to switch the PageIndicator in specific Launchers" into tm-dev am: 6d6f62c462 am: 8b3dd9493c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17399997

Change-Id: Ib66d34fa739378436ecb8327c6524f2e8b59abe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 21:22:31 +00:00
Bill Yi b02e321f12 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c92a -s ours am: 17561f2af1 -s ours am: 5976b9813c -s ours am: 9030380318 -s ours am: c4d85f8f38 -s ours am: 06149e42b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieaac25cb15e8a9920182d812d60bd0fcf1c3ed6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 21:04:19 +00:00
Bill Yi d7207c9ab2 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours am: b613e0f43d -s ours am: 3ebae8de95 -s ours am: c5402f8d82 -s ours am: 46e166e78c -s ours am: 0f482406ee -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1e814ea085513e03aaad5fb472019cf19a2b216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 21:04:04 +00:00
Shikha Malhotra 8b3dd9493c Merge "Added provision to switch the PageIndicator in specific Launchers" into tm-dev am: 6d6f62c462
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17399997

Change-Id: I0cd23df0bf1fa5c1a83a586c21464777bfa70006
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:58:37 +00:00
Shikha Malhotra 89be01f39b Merge "Added provision to switch the PageIndicator in specific Launchers" into tm-dev am: 6d6f62c462
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17399997

Change-Id: Icb547ebd6cbcf9d269c71fa299ca8cc5cf2bce53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:58:04 +00:00
Bill Yi 06149e42b4 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c92a -s ours am: 17561f2af1 -s ours am: 5976b9813c -s ours am: 9030380318 -s ours am: c4d85f8f38 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3365b335ab9d24b37c7f31322d7e6acc697192f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:34:26 +00:00
Bill Yi 0f482406ee [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours am: b613e0f43d -s ours am: 3ebae8de95 -s ours am: c5402f8d82 -s ours am: 46e166e78c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I639baefca38dcdfa4ac8641396ca567987dcb23c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:34:08 +00:00
Shikha Malhotra 7199c7c05e Merge changes from topic "WIPPagination" into tm-mainline-prod am: 93b2a38b7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17399997

Change-Id: Ic30e97e8c440183b3049ccdb4b75c0d94bf9c119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:31:11 +00:00
Shikha Malhotra 6d6f62c462 Merge "Added provision to switch the PageIndicator in specific Launchers" into tm-dev 2022-04-08 20:17:44 +00:00
Shikha Malhotra 93b2a38b7f Merge changes from topic "WIPPagination" into tm-mainline-prod
* changes:
  [automerge] Added provision to switch the PageIndicator in specific Launchers 2p: 0f2e1b6714
  Added provision to switch the PageIndicator in specific Launchers
2022-04-08 20:17:44 +00:00
Shikha Malhotra e44a9fd28e Merge changes from topic "WIPPagination"
* changes:
  [automerge] Added provision to switch the PageIndicator in specific Launchers 2p: 0f2e1b6714 2p: 070def81b0
  [automerge] Added provision to switch the PageIndicator in specific Launchers 2p: 0f2e1b6714
  Added provision to switch the PageIndicator in specific Launchers
2022-04-08 20:17:44 +00:00
Bill Yi a68c752e56 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c92a -s ours am: 17561f2af1 -s ours am: 5976b9813c -s ours am: 9030380318 -s ours am: ab256baf1f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0e22a7a25af630b8c96b39a1b4b05300219fef31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:03:02 +00:00
Bill Yi c1fbf845c4 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours am: b613e0f43d -s ours am: 3ebae8de95 -s ours am: c5402f8d82 -s ours am: c42680cc9f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I588d873ff545ce8b7937debb31caf97871d131d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 20:02:44 +00:00
Bill Yi c4d85f8f38 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c92a -s ours am: 17561f2af1 -s ours am: 5976b9813c -s ours am: 9030380318 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77d7ca9734d0b1b7685a1824116353f438f9dd66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:57:41 +00:00
Bill Yi 46e166e78c [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours am: b613e0f43d -s ours am: 3ebae8de95 -s ours am: c5402f8d82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie619c924491523d69645f41f622c7f5cacd0a73f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:57:22 +00:00
Bill Yi ab256baf1f [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c92a -s ours am: 17561f2af1 -s ours am: 5976b9813c -s ours am: 9030380318 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9245a6599b55d58814f2f0c15c8e473d5faabf5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:56:57 +00:00
Bill Yi c42680cc9f [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours am: b613e0f43d -s ours am: 3ebae8de95 -s ours am: c5402f8d82 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I85ffa27fe2c8b92a7207a27a28e20fa99b3938ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:56:37 +00:00
Bill Yi 9030380318 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c92a -s ours am: 17561f2af1 -s ours am: 5976b9813c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03d9f0a6e7d1e0caa04d38c6b48b3dfe8dd6fa98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:46:47 +00:00
Bill Yi c5402f8d82 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours am: b613e0f43d -s ours am: 3ebae8de95 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb6b53c9000536c133e424f65b0ace8736611097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:46:28 +00:00
Presubmit Automerger Backend 75fab2112a [automerge] Implement splitting from Taskbar long-press 2p: abdf25d226 2p: 5c638fdfbe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17530994

Bug: 217964720
Change-Id: I97bc3a9c202ffb6897b66319ae7e0f722f4903cf
2022-04-08 19:16:20 +00:00
Presubmit Automerger Backend 5c638fdfbe [automerge] Implement splitting from Taskbar long-press 2p: abdf25d226
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17530994

Bug: 217964720
Change-Id: Ie8cc35c7ba358782186d5c0a9e9d994dfd8ba9a1
2022-04-08 19:16:13 +00:00
Jeremy Sim abdf25d226 Implement splitting from Taskbar long-press
Implements the ability to split the screen by long-pressing a Taskbar icon.

Bug: 217964720
Test: Manual
Change-Id: I5d324d8ca912c10cc3c3de21cae98fad546b85ac
2022-04-08 12:15:16 -07:00
Bill Yi 5976b9813c [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c92a -s ours am: 17561f2af1 -s ours
am skip reason: Merged-In Ic3e8c89ef9571af2b88516911f0fe1238a2eb847 with SHA-1 e24db03da4 is already in history

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

Change-Id: I41f86251536e6bdf4c1960d816eb4e82c31b9a44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:14:48 +00:00
Bill Yi 3ebae8de95 [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours am: b613e0f43d -s ours
am skip reason: Merged-In Ic3e8c89ef9571af2b88516911f0fe1238a2eb847 with SHA-1 e24db03da4 is already in history

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

Change-Id: I9bef565dceafeb2d96208f07db8824f5b81f7c32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 19:14:32 +00:00
Bill Yi 17561f2af1 [automerger skipped] Merge "Merge SP2A.220405.004 to aosp-master - DO NOT MERGE" am: e7c175c92a -s ours
am skip reason: Merged-In Ic3e8c89ef9571af2b88516911f0fe1238a2eb847 with SHA-1 e24db03da4 is already in history

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

Change-Id: Ibc08dff78d69d650aef6e1d8ed51a1f5a851bbf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:31:40 +00:00
Bill Yi b613e0f43d [automerger skipped] Merge SP2A.220405.004 to aosp-master - DO NOT MERGE am: 7c68785b02 -s ours
am skip reason: Merged-In Ic3e8c89ef9571af2b88516911f0fe1238a2eb847 with SHA-1 e24db03da4 is already in history

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

Change-Id: Ib471841e6f9a72588df776293ceda24b90f8581a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:31:21 +00:00
Brian Isganitis 092f1a4fd1 Merge "Add separate AFV type for options popup dialog." into tm-dev am: d3d6f0d6db am: 69583c33ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17647857

Change-Id: I7ef2ae1923c7b426befba5e81b0fad1b5e71b5b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:21:09 +00:00
Brian Isganitis 348b3ab035 Merge "Add separate AFV type for options popup dialog." into tm-dev am: d3d6f0d6db am: d40fc4b6ef am: 051356e03d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17647857

Change-Id: Ic3be61082d1e705fc83e3c154e754df4a7a72879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:16:26 +00:00
TreeHugger Robot ed2cb90046 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: b01524ff6f -s ours am: 82ad998d6d -s ours am: d069d2be08 -s ours am: 8bfaa22775 -s ours am: 6f1a31d046 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e61a25b37015631827ba02e0051e0e93d3bffe7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:16:15 +00:00
Bill Yi 49b8ebeb68 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e9903f38db -s ours am: 5f94b389e5 -s ours am: 80d8193384 -s ours am: 0608ece378 -s ours am: 2386023559 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36826f8b551aa34ff8e914903c950e6a0c5579dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 18:16:14 +00:00