Commit Graph

78507 Commits

Author SHA1 Message Date
Jeremy Sim 7b6b368537 Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539

Change-Id: I484f619a39ebfd8e7ab7112e02b8e317db81970b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:52:23 +00:00
Sunny Goyal bfe800cd55 Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152

Change-Id: I5917b0f1a713d4ce71f790ce1c162c2316033886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:52:06 +00:00
fbaron 55c10be912 Update app ring color and alpha
Bug: 268521231
Test: Verify that app ring colors match the figma attached in the bug
Flag: no flag
Change-Id: I2270f6e5e3ad2c653aad36feb2232a672bdf2a79
2023-05-11 15:45:52 -07:00
Treehugger Robot c53018d534 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b456274145 -s ours am: c6761384ab -s ours am: 625032d178 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7c58b34860b060861a1ae2118b05686df6bfb2a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:38:17 +00:00
Bill Yi 1fe80b281d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 28bc032e14 -s ours am: b9272d346e -s ours am: 53989ca148 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I76728a5ea81339bab71020c26af3349d1e626f4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:38:09 +00:00
Treehugger Robot eb288b9a78 Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 3b7009bc57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739

Change-Id: Ia96987dcbeb7aa2223ccc1b8455d6c2abb8da55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:33:47 +00:00
Treehugger Robot 821c7cc64d Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 1e92350f86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739

Change-Id: Iea93d3b2eb2c4d602297594cafe6eeb626f7982a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:33:46 +00:00
Jeremy Sim 7158d2d0e2 Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev 2023-05-11 22:31:34 +00:00
Sunny Goyal a0231eafa3 Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: 4e4da5c95e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443

Change-Id: Id1d6cf3167a74d2d05834bc56486af120abe6966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:31:30 +00:00
Sunny Goyal eed29d5b49 Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: a0db88cee5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443

Change-Id: Iff569b1d6215e2b080517bedd07de037765a4d09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:31:17 +00:00
Treehugger Robot 4d5b3e50f6 Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 3b7009bc57
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739

Change-Id: I098af1f09aabf933c56a7c6ae8766afcb16b9b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:29:40 +00:00
Sunny Goyal 0eaf9b0e75 Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: a0db88cee5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443

Change-Id: I24c07573a1cd1d5b006868945405f18e25412fcb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:27:26 +00:00
Sunny Goyal c110587dba Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev 2023-05-11 22:24:45 +00:00
Sunny Goyal 09905cfa90 Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""
This reverts commit bca4e694f0.

Reason for revert: post submit broken

Change-Id: I8afc63b5aa67ee14127f79e2245ef543bff8cf31
2023-05-11 22:22:16 +00:00
Treehugger Robot 93005695c9 Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 7f51cb5513
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739

Change-Id: Ie84e306e7eeca2141c73488539b7345547b25dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:08:09 +00:00
Sunny Goyal e3cd579e7d Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: d10d3d9aa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443

Change-Id: Ia28b795bec507253d35e39096b761367369202ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:05:52 +00:00
Vinit Nayak 88a91bbd16 Add logs to check which userId is used for workProfile matcher
Flag: none
Test: compiles
Bug: 243688989
Change-Id: I0a579203cc0c51f7707180b323ed4828f1dea297
2023-05-11 14:55:00 -07:00
Treehugger Robot 3b7009bc57 Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739

Change-Id: I203a9bc846ff227ac3b64af44395c81dcf6b0375
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:50:50 +00:00
Sunny Goyal a0db88cee5 Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443

Change-Id: I121d0540ffc6a8ec3084162e4c676cfed7e6287f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:50:40 +00:00
Treehugger Robot 1e92350f86 Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739

Change-Id: I2a447fc36ab12ce58df08bc53f6e9be3c95dee3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:46:40 +00:00
Sunny Goyal 4e4da5c95e Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443

Change-Id: Ie4d576a000eeee5a62cf5c429fcb49a4078a8712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:44:30 +00:00
Treehugger Robot 1301d15de1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b5d028d101 -s ours am: 464b1274ca -s ours am: 39d27cb6e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie74a5976a4a8ee65b5778821833b40d8ed275ac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:31:42 +00:00
Bill Yi 9122c5e477 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 6a90c39ab3 -s ours am: 83fedff404 -s ours am: 3ffd4d922e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e26c680717057567a3eb8284dfeb2972528de89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:31:33 +00:00
Treehugger Robot 7f51cb5513 Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739

Change-Id: I36e6ccc498b5cd64239820ad0f144afe586730f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:28:30 +00:00
Treehugger Robot afe096a18c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b456274145 -s ours am: 25969501e8 -s ours am: 89b7b099fe -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0666377483b58d4d1a1c6411287de8bb66aa8a29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:28:02 +00:00
Bill Yi 6dd5a9e517 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 28bc032e14 -s ours am: 80ed083789 -s ours am: 42b1a3e96e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1bba57434559abb6c875d9e0a38b93a858a8e59d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:27:52 +00:00
Treehugger Robot 0bc85a06b6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: f8ff957ed5 -s ours am: 9d002f062f -s ours am: e89475f51b -s ours am: 923a2e5753 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I68fc48667ef9dc78a23ef95701436076b1f92545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:27:36 +00:00
Sunny Goyal d10d3d9aa4 Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443

Change-Id: I002f424a0e367b53c4bac4cdae53a4735fc3e2bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:26:59 +00:00
Treehugger Robot 52d4764576 Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev 2023-05-11 20:58:02 +00:00
Treehugger Robot c258d8c5d3 Merge changes from topic "tc_change_2305100725_41" into tm-qpr-dev-plus-aosp am: 37f938129a am: d004e85381 am: 6aa7b09abf am: 0c76bf7370
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645

Change-Id: I3e9533ccb8851a03d8a4fd323d177d55a584f9be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:43:31 +00:00
Treehugger Robot 625032d178 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b456274145 -s ours am: c6761384ab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I33442be6d770378b1eeee8cbb9ed5fb4a6199633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:40:11 +00:00
Bill Yi 53989ca148 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 28bc032e14 -s ours am: b9272d346e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6bec521371c06b8fbabcc5ccb9307854c536c80e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:40:02 +00:00
Sunny Goyal 04a6211120 Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev 2023-05-11 20:22:51 +00:00
Treehugger Robot 39d27cb6e3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b5d028d101 -s ours am: 464b1274ca -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8e4beca4472f95d96e633ac48f558593fda9a43c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:09:53 +00:00
Bill Yi 3ffd4d922e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 6a90c39ab3 -s ours am: 83fedff404 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iddece4df4e6c37150d32fc1e7d168d1ac9a78b5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:09:42 +00:00
Treehugger Robot 89b7b099fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b456274145 -s ours am: 25969501e8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I397a0eba4b18f7cb1ad7bd67b2ac21ac489082c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:08:51 +00:00
Bill Yi 42b1a3e96e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 28bc032e14 -s ours am: 80ed083789 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9bb8a562900f677b88eab9c0608e495702548de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:08:40 +00:00
Treehugger Robot 923a2e5753 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: f8ff957ed5 -s ours am: 9d002f062f -s ours am: e89475f51b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5fe0b4cf1041fbe960ce7b47d43ddca78b0c51c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:03:50 +00:00
Treehugger Robot 0c76bf7370 Merge changes from topic "tc_change_2305100725_41" into tm-qpr-dev-plus-aosp am: 37f938129a am: d004e85381 am: 6aa7b09abf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645

Change-Id: Iac4255205e1553980e2384ce63324270489a531e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:03:41 +00:00
Treehugger Robot 7015f29c76 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: 83cfb28b75 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I937156e39bdc9f8254b7da9eb99d8ef9c0ae2ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:41:56 +00:00
Bill Yi 888c59b5a2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 01d51b6ec6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2b56b80b93e5f8ffe27d773126695606924d03a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:41:46 +00:00
Treehugger Robot 25969501e8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b456274145 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7b81b42ad76f5bfb68d1212c7f0bb4fdf84e008a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:40:58 +00:00
Bill Yi 80ed083789 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 28bc032e14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I955b00138f93f3e4ff475e9eb086c89acf00732e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:40:49 +00:00
Treehugger Robot c6761384ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b456274145 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2a337addba5b46035b862bd3332a7caa0a5c1bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:40:46 +00:00
Bill Yi b9272d346e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 28bc032e14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2d3e216ef760b7f067794d017b1ffa581566d673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:40:36 +00:00
Treehugger Robot 464b1274ca [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: fa74c1ab70 -s ours am: b5d028d101 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57669a60f37fd6fac4f4a6b205953247561486ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:31:49 +00:00
Bill Yi 83fedff404 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4952c38e99 -s ours am: b7b9abc978 -s ours am: 6a90c39ab3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I77a983c22ea109bdeada2ec4f45d34d3d5b6f46c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:31:40 +00:00
Treehugger Robot e89475f51b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 674ef91120 -s ours am: f8ff957ed5 -s ours am: 9d002f062f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic44df162aef83d73a7fdfacb95141e7e4e384396
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:29:38 +00:00
Treehugger Robot 06b66f21cf Merge changes from topic "tc_change_2305100725_41" into udc-dev-plus-aosp am: 8f938232aa am: a6860833bc am: b1de31a23a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122645

Change-Id: Iafcadd6add38668895cff05bf38458a43299efe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:24:28 +00:00
Bill Yi 5dd3606503 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4952c38e99 2p: 7d3a3796f6 am: 1ad3d1c2be -s ours am: c975d3b15e -s ours am: d346e515b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifbf8988b8a1096b0b5131c1958f0a55e8cd1d3a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:24:19 +00:00