Commit Graph

49925 Commits

Author SHA1 Message Date
Andy Wickham 37377bdd0c Merge "Enables keyboard option by default." into tm-dev am: 2d5bda75fc am: 0cad673992
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18687151

Change-Id: I8f60fa1cb189cc495000b185dff65628c1bcccb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:27:45 +00:00
Andy Wickham b8dd99d01e Merge "Enables keyboard option by default." into tm-dev am: 2d5bda75fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18687151

Change-Id: Idb19424934c220b7e027ab05453c5a04da9ad857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:08:45 +00:00
Andy Wickham 0cad673992 Merge "Enables keyboard option by default." into tm-dev am: 2d5bda75fc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18687151

Change-Id: I5f015e7bc221ec9cce4cc508fb97c3d96ec5ba4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 22:07:07 +00:00
TreeHugger Robot 1a339394af Merge "Ensure null elements aren't added to TaskView shortcut list" into tm-qpr-dev am: 9307776597
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18759197

Change-Id: I19a2a12de503313067a5516ce401dbbd0fb6c894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:59:54 +00:00
Andy Wickham 2d5bda75fc Merge "Enables keyboard option by default." into tm-dev 2022-06-06 21:45:17 +00:00
Treehugger Robot db8ba96cc0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 70689199c1 -s ours am: bf8a2429ea -s ours am: 2dd956cf8a -s ours am: 3408584749 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5362015e9db414b093cabd6612520c0eb6fbac9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:42:48 +00:00
Bill Yi ad7d82a6ed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e8ad70206 -s ours am: 30e5748993 -s ours am: ceda8a2ef7 -s ours am: c1bb868d3d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iae1e5f8d4187d094c76d95a91dffc9b83aec93d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:42:43 +00:00
Treehugger Robot 22abfdcb70 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fd1fae4277 -s ours am: 0cd951ea1e -s ours am: 2433d48fc7 -s ours am: d0dd51b269 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icd55040764a0405295dfcdb7351b9df102c570a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:42:37 +00:00
Bill Yi 84308aa1dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b81886af7 -s ours am: a1ba8d0b9f -s ours am: d3e9a4f8e2 -s ours am: 6560ccbc32 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9cead39a9115d2c8e9e30452ea4b33c9d71d550f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:42:27 +00:00
Treehugger Robot 71da52ce7b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d8768464a2 -s ours am: f82012ed90 -s ours am: 46f15d8caa -s ours am: da9f49f18a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb37631581e13aaccc3af8dd0ec0786f60f97380
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:42:13 +00:00
Bill Yi ce4bd9f347 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2989bc50c -s ours am: cff899118a -s ours am: 8a5108c1b7 -s ours am: e659655416 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70435e6be998d9980b9061013e5bb150fb6adab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:42:01 +00:00
TreeHugger Robot 9307776597 Merge "Ensure null elements aren't added to TaskView shortcut list" into tm-qpr-dev 2022-06-06 21:36:43 +00:00
Brandon Dayauon 7a8a9ed170 Fix issue where allAppsCellWidth is 0
when using secondary display on non-scalable grids causing allApps to be squished.
Bug: 234748862
Test: Manual

Change-Id: I2e92bce69438a17eccb0e4b2b2e3f2bdbfa7600e
2022-06-06 14:32:22 -07:00
Treehugger Robot 3408584749 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 70689199c1 -s ours am: bf8a2429ea -s ours am: 2dd956cf8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1b7e12af8d0d233762094c5a33d24e950b07dbd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:22:27 +00:00
Bill Yi c1bb868d3d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e8ad70206 -s ours am: 30e5748993 -s ours am: ceda8a2ef7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1992e4cf146f8d1c8f779604fe00694fcfc81f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:22:20 +00:00
Treehugger Robot d0dd51b269 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fd1fae4277 -s ours am: 0cd951ea1e -s ours am: 2433d48fc7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I329151bca05f7a8f59f4657ba3ffbd7d8681c50f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:22:14 +00:00
Bill Yi 6560ccbc32 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b81886af7 -s ours am: a1ba8d0b9f -s ours am: d3e9a4f8e2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb9f000194491e769ab9ed21807fd23c21096709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:22:04 +00:00
Treehugger Robot da9f49f18a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d8768464a2 -s ours am: f82012ed90 -s ours am: 46f15d8caa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I78842b4e521744a1cdc0dc0409ed35dacf4125ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:21:50 +00:00
Bill Yi e659655416 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2989bc50c -s ours am: cff899118a -s ours am: 8a5108c1b7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I61aa03a8987488be547409a45da553c23d8cf8ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:21:38 +00:00
Vinit Nayak 7b3916c550 Merge "Remove old split screen overview related code" into tm-qpr-dev am: 2aa5a816e9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18638742

Change-Id: Ie15ebcfbe2c1e5dada52b475511278a928beff9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 21:12:54 +00:00
Vinit Nayak 5424fca602 Rename split classes/variables for consistency
* Use "select" when in the split screen
invocation process
* Drop usage of "staged" except when defining
constants

Fixes: 233006032
Change-Id: I809f0e1e9742aa6b6b09ad8731896ad3f0c9deb0
2022-06-06 14:02:15 -07:00
Treehugger Robot 2dd956cf8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 70689199c1 -s ours am: bf8a2429ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: If7b19821554c3ce314a04b6fdc4c9652661b0237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:54:01 +00:00
Bill Yi ceda8a2ef7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e8ad70206 -s ours am: 30e5748993 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ide9967f5c79baacf7935384c6abe69d2c50ad684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:53:54 +00:00
Treehugger Robot 2433d48fc7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fd1fae4277 -s ours am: 0cd951ea1e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I99acf817eb9e84ef833ead295d462659ae70effa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:53:48 +00:00
Bill Yi d3e9a4f8e2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b81886af7 -s ours am: a1ba8d0b9f -s ours
am skip reason: subject contains skip directive

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

Change-Id: If67b6cd9cd88be61f1cb885d104d524a229cf7e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:53:39 +00:00
Treehugger Robot 46f15d8caa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d8768464a2 -s ours am: f82012ed90 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3173de8e3e81033e671af60e5af8f4f9ef7760d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:53:27 +00:00
Bill Yi 8a5108c1b7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2989bc50c -s ours am: cff899118a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a44c8c96e0907eb408b205efa4f4b8a90f5b36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:53:13 +00:00
Vinit Nayak 2aa5a816e9 Merge "Remove old split screen overview related code" into tm-qpr-dev 2022-06-06 20:49:45 +00:00
TreeHugger Robot 25027e1b96 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 836dbca092 -s ours am: 20c41f5918 -s ours am: 9d348aaf15 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idb59f2f85f6baf690a579071990555dbec413407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:40:50 +00:00
Bill Yi b2842e4840 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a31959e9de -s ours am: 3ade2a70f1 -s ours am: cc9142927d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib28076a68ef9b73aa697362173f0995d4388d6e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:40:36 +00:00
TreeHugger Robot 52c4ac53d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 451d752a1f -s ours am: db01fde93a -s ours am: e5409a3d73 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia1aa22fa8ee6763091d9e3908d4bbd1faeae0e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:13:53 +00:00
Bill Yi 7f73190b6f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e76968615 -s ours am: 065e690f71 -s ours am: 75482fa774 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2bbc620c49e74e93259a7abf973693c09bd22f1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:13:45 +00:00
Bill Yi 05245b14ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13797b3952 -s ours am: dc23da03e5 -s ours am: cb47717ca5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e1fddc79d51748e96012ce1bf82d48e778fe23d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 20:13:33 +00:00
James O'Leary ede514f275 Update notification dot from T90 to T80
Bug: 213314628
Test: work with UX to pick something darker than T80, present options
from T70 to T90, get feedback to use T80, verify at runtime via
screenshot dot is T80.

Change-Id: Ic5b47a419eb7697c22c4dd9ab849b8a00d73be9f
2022-06-06 16:01:45 -04:00
TreeHugger Robot 9d348aaf15 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 836dbca092 -s ours am: 20c41f5918 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib13f37e8ed70f71969d9d7e48cc93be1dec0316e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:56:26 +00:00
Bill Yi cc9142927d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a31959e9de -s ours am: 3ade2a70f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d805f2fff26a232cda2d3096a94f2591d58f026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:56:14 +00:00
TreeHugger Robot e5409a3d73 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 451d752a1f -s ours am: db01fde93a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad255cfe6917a34053f4f88c2a57279e1a5cc9e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:47:35 +00:00
Bill Yi 75482fa774 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e76968615 -s ours am: 065e690f71 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3041bcca6ee0436f7681e49755cf0d924e59197a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:47:27 +00:00
Bill Yi cb47717ca5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13797b3952 -s ours am: dc23da03e5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c40e7689f3c068ba350b974efbafcdf86323471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:47:16 +00:00
TreeHugger Robot 20c41f5918 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 836dbca092 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia860320ae4e71f1c3362eb08f63279111d767e42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:44:19 +00:00
Bill Yi 3ade2a70f1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a31959e9de -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia06232c3ffd17e8ec8e41f5cea90100e6ce434f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:44:06 +00:00
TreeHugger Robot db01fde93a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 451d752a1f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4ddaa46fa6ebe2cf8f0f7aba40ef7acbb800d5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:14:59 +00:00
Bill Yi 065e690f71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 5e76968615 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I255dafbd4109a41f3296e236af7c7a3965622738
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:14:53 +00:00
Bill Yi dc23da03e5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13797b3952 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2997e519c5b74fd6cf325fe040d220e6a3c6a720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:14:41 +00:00
Treehugger Robot bf8a2429ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 70689199c1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I540ce3429cb4b1b86b8554a08677679c932b05e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:09:06 +00:00
Bill Yi 30e5748993 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8e8ad70206 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4b22c04a2936c1115fc95490f1673e42fe04cffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:09:00 +00:00
Treehugger Robot 0cd951ea1e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: fd1fae4277 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I060b05118dabe323e379a0a62b8445ec2f110d2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:53 +00:00
Bill Yi a1ba8d0b9f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2b81886af7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I89cc026c8d8ebcf0e211054a04524c796ac194c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:38 +00:00
Treehugger Robot f82012ed90 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: d8768464a2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5dd7923b187b2875761f4f1e62118dd722aa5212
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:23 +00:00
Bill Yi cff899118a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d2989bc50c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I612cc8e7e358b9eb2b81ac635a94d25e0e3597ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-06 19:08:12 +00:00