Commit Graph

58436 Commits

Author SHA1 Message Date
Andy Wickham 824d4521ab Merge "Fixes Search bar padding when work profile not present." into tm-dev am: 34e8c3364a am: 3343ffa5cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18789522

Change-Id: Ic85fd5a09d1770e72e23d96303c45ca97c5bb121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:43:11 +00:00
Andy Wickham 57698a6546 Merge "Fixes Search bar padding when work profile not present." into tm-dev am: 34e8c3364a am: ef4136ad4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18789522

Change-Id: I6fbda54f1e160eebe9561bbe5ad6b09c9df71155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:42:10 +00:00
Andy Wickham aade3dc637 Merge "Fixes Search bar padding when work profile not present." into tm-dev am: 34e8c3364a am: ef4136ad4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18789522

Change-Id: I2db55aaab2e0ad4ad8b2f3388f0cc7fe404a2aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 19:41:29 +00:00
TreeHugger Robot a49ba25353 Merge "Fix NPE when user swipes back in All Apps and no matching view found" into tm-dev 2022-06-10 19:05:32 +00:00
Becky Qiu fa317f4420 [Toast] Add a new type fields for user visible cold status.
Bug: 235249335
Test: manual
Change-Id: I58eee38e740e746e8a3d6065d4ef57cc5569a837
2022-06-10 12:03:56 -07:00
Andy Wickham ef4136ad4e Merge "Fixes Search bar padding when work profile not present." into tm-dev am: 34e8c3364a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18789522

Change-Id: I8d658f44c3aba4e8909a88853ee92beaa01aaf84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:29:10 +00:00
Andy Wickham c2af8be5b1 Merge "Fixes Search bar padding when work profile not present." into tm-dev am: 34e8c3364a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18789522

Change-Id: I3ec6131d4c63e28ca46fab35f53305246bbbd8b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:28:07 +00:00
Andy Wickham 3343ffa5cf Merge "Fixes Search bar padding when work profile not present." into tm-dev am: 34e8c3364a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18789522

Change-Id: Iaa94d52bfbc5bb4be8de0ec0a79b1e8951e0ce02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:27:44 +00:00
Sunny Goyal 20a67162f1 Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52 am: 3e4d940ba4 am: beba969a7a am: 5a7f2ec89c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: I2e0ed840fe73c7955e7c7ffc6ed30170cdde7e7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:22:21 +00:00
Sunny Goyal 88e5b60279 Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52 am: 41fda6802e am: 03c59ea519 am: 6cd4bcdc42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: I33905ad1b43298f2f5bc6eeb722a4f78ebc9159a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:21:55 +00:00
Sunny Goyal 5d81584e1f Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52 am: 41fda6802e am: 91956ee223 am: 350d6f6d70
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: I4e0ef779a7c69e8268f482bd4b2c33837ed8cc84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:21:13 +00:00
Andy Wickham 34e8c3364a Merge "Fixes Search bar padding when work profile not present." into tm-dev 2022-06-10 17:07:43 +00:00
Sunny Goyal 5a7f2ec89c Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52 am: 3e4d940ba4 am: beba969a7a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: Idb190890332609a48760170f869d923428b1c95f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:04:53 +00:00
Sunny Goyal 6cd4bcdc42 Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52 am: 41fda6802e am: 03c59ea519
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: I3b99a4e354d1e12c24f76de92fac37f457ff19cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:03:40 +00:00
Sunny Goyal 350d6f6d70 Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52 am: 41fda6802e am: 91956ee223
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: Ibedf868855cfe1ce412224248a32a50683967afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 17:03:35 +00:00
Sunny Goyal beba969a7a Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52 am: 3e4d940ba4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: Ic5ae7ad513d65e068eb5534ec083fc278a5f8c41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 16:20:02 +00:00
Sunny Goyal 91956ee223 Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52 am: 41fda6802e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: I167756312d2c6494f41c06e650039e7b33e426eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 16:19:56 +00:00
Sunny Goyal 03c59ea519 Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52 am: 41fda6802e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: Ib335350b03490d7da681b8ca93271a11af36e685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 16:19:53 +00:00
Jon Miranda f26bdcb4c1 Fix NPE when user swipes back in All Apps and no matching view found
This crash will occur every time user swipes back and
there is not a view to return to

Introduced in I56cda07f3eccc11e8909f7fb28210f65cc6e0f1d

Bug: 235494234
Test: manual
Change-Id: I1261afcefec8fed4be20ab9ef439a50bc706d464
2022-06-10 16:00:18 +00:00
Sunny Goyal 41fda6802e Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: Iec0725d6d059803aa8a24bf9b303a180db392fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 15:54:22 +00:00
Sunny Goyal df44164ae6 Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: I9af35da8cb8970baac95832f889eea42a31b6d52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 15:53:02 +00:00
Sunny Goyal 3e4d940ba4 Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev am: ad7e199e52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18818891

Change-Id: I6b83718c02726d518bb909f086125b6cbdb6a2a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 15:53:00 +00:00
Sunny Goyal ad7e199e52 Merge "Clone the drawable lazily instead of on the UI thread while initializing" into tm-dev 2022-06-10 15:28:30 +00:00
Shikha Malhotra ccef3e02d2 Create android library for Go resources without src files
This is to ensure that the downstream projects like LauncherLily can
compile the sources itself and thus not include them twice in the
compilation leading to other errors/warnings in the code base

Bug: b/216136346
Test: manually tested LauncherLily
Change-Id: I3bd9962493a40842ae34d682a0c2d418d4703739
2022-06-10 09:52:04 +00:00
TreeHugger Robot 8f3b1e7035 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecea734d9f -s ours am: 826356355d -s ours am: 42eca8dbec -s ours am: 2e46509f6e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic9ffe37eec1b1fdc6de1eb1fa3ecbe1b60f293e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 08:22:14 +00:00
Bill Yi 753f5c8947 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13d38f34e3 -s ours am: 2b59e1d397 -s ours am: 7e313998e4 -s ours am: 78ae3a48ec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia291245e4a5022085d6302258fa9c57fcc67380c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 08:22:03 +00:00
Automerger Merge Worker 556dc13e8a Merge changes from topic "am-1b5ff54850484f67a65c2bda86eb0cf0" into tm-qpr-dev-plus-aosp am: bfb223718f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18811510

Change-Id: Id0548b0bda8f35e498262afde2af0a6afa384cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 08:19:18 +00:00
TreeHugger Robot fedab19944 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecea734d9f -s ours am: 0c78d0b38f -s ours am: c8aefb0329 -s ours am: dbd4891be3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I54be88c7b2b714774ed41ce1c7bf459081529031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 08:19:08 +00:00
TreeHugger Robot 0dc5d04a3a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecea734d9f -s ours am: 0c78d0b38f -s ours am: baaa749bf4 -s ours am: a6f7b7f960 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia37a7ea53951ebcfd24df770bc77789256b74fd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 08:13:20 +00:00
Bill Yi 0f3ef83451 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13d38f34e3 -s ours am: ecc1fd4a5f -s ours am: 7015fa3d37 -s ours am: e86725cd28 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7e61973b4ff414fd0a97d58bdc9bae0a20a9adb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 08:13:09 +00:00
Automerger Merge Worker a326f3bd99 Merge changes from topic "am-a4fc79aa8a7f4f2bbfed940ed8f78c83" into tm-qpr-dev-plus-aosp am: 74970f3379
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18817652

Change-Id: I11265e3543dd196aac8871fe951630988fc5c213
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 08:08:26 +00:00
Bill Yi 8aae0e041a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbdb15c84d -s ours am: 5cc2216d23 -s ours am: 747282ff05 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iab001ac9a27024eabd17872300f57015a7297b86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 08:08:12 +00:00
Bill Yi d7e202f06a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbdb15c84d -s ours am: 24643fbd1b -s ours am: 01ac44f6a6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib8582dedfbf98d08ef57f428350de45f19b1f2e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 08:00:06 +00:00
Bill Yi e6cb50d88c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 406110138a -s ours am: 28c37067b0 -s ours am: 5c26e0a6f4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic2753115b2d69b7ee664992ee4ee65035826860e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 08:00:03 +00:00
Bill Yi d8c0109aaf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3501174dbc -s ours am: 5a10a053e4 -s ours am: 000ead1ef5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia69020fa96a1d67eb221474dfb2ba1be72b5db9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:59:50 +00:00
Bill Yi 147f276175 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 116ef9533a -s ours am: f6e612a4ee -s ours am: c0cff417f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3044e39c6904ef6725768f325ea7bc39d0c540b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:59:34 +00:00
TreeHugger Robot 2e46509f6e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecea734d9f -s ours am: 826356355d -s ours am: 42eca8dbec -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icb5c4ada8c1c132f4bdb8e0ac68e33807c9349aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:37:24 +00:00
Bill Yi 78ae3a48ec [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13d38f34e3 -s ours am: 2b59e1d397 -s ours am: 7e313998e4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa880b04d020f44b5916351ea4bfaa4f6bdbfcc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:37:12 +00:00
Automerger Merge Worker bfb223718f Merge changes from topic "am-1b5ff54850484f67a65c2bda86eb0cf0" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecea734d9f -s ours am: 0c78d0b38f -s ours am: c8aefb0329 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13d38f34e3 -s ours am: ecc1fd4a5f -s ours am: 24582a45e7 -s ours
2022-06-10 07:36:03 +00:00
TreeHugger Robot a6f7b7f960 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecea734d9f -s ours am: 0c78d0b38f -s ours am: baaa749bf4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4805e9d1ec8f776d93f364cb0ce6b6a556f5ecc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:35:03 +00:00
TreeHugger Robot dbd4891be3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: ecea734d9f -s ours am: 0c78d0b38f -s ours am: c8aefb0329 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id25c910fd6f04b01642a394a4587b7a26d875c2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:35:02 +00:00
Bill Yi e86725cd28 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13d38f34e3 -s ours am: ecc1fd4a5f -s ours am: 7015fa3d37 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c729419460bf5f9fa7435b82f146a9013f12c27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:34:53 +00:00
Bill Yi 7d0bbc90f2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13d38f34e3 -s ours am: ecc1fd4a5f -s ours am: 24582a45e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2c4ea3d02a75368aab1fa33e9dcf855994a62317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:34:51 +00:00
Automerger Merge Worker 74970f3379 Merge changes from topic "am-a4fc79aa8a7f4f2bbfed940ed8f78c83" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbdb15c84d -s ours am: 5cc2216d23 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 406110138a -s ours am: 9174813228 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3501174dbc -s ours am: 0b92b64913 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 116ef9533a -s ours am: 48cb22f99f -s ours
2022-06-10 07:32:41 +00:00
Bill Yi 747282ff05 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbdb15c84d -s ours am: 5cc2216d23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3d2abf7324de89e4a9ce8a31f19b82cc57adf570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:31:35 +00:00
Bill Yi 98a57ca8a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 406110138a -s ours am: 9174813228 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I297343721183028d1d0fb7cf46f6c33afafd40df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:31:32 +00:00
Bill Yi 16a1e28a6b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 3501174dbc -s ours am: 0b92b64913 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d92fc1ccfe7295b670e9f860433292b70da75f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:31:18 +00:00
Bill Yi a0b3460f80 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 116ef9533a -s ours am: 48cb22f99f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id458e45259a6cd4263285ad910f1d428ebb269c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:31:01 +00:00
Bill Yi 01ac44f6a6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cbdb15c84d -s ours am: 24643fbd1b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icefe16620409dcbc77d6274bf257b5640fc80b21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:31:00 +00:00
Bill Yi 5c26e0a6f4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 406110138a -s ours am: 28c37067b0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I92f0954f93718ca10daa5e4418836cec9f393088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-10 07:30:57 +00:00