Commit Graph

48694 Commits

Author SHA1 Message Date
Automerger Merge Worker a66ea486fd Merge changes from topic "am-3814f95bacde4982ab989e398ac8052d" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3466bf399f -s ours am: d789af8fa1 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e70eb221ab -s ours am: 5fb97b1786 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 25e3bfb284 -s ours am: 99fe54c872 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a6e8b09a3 -s ours am: c1ebd2f489 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a1185c5274 -s ours am: 166148a02d -s ours
2022-08-23 06:52:17 +00:00
TreeHugger Robot df3752df79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3466bf399f -s ours am: dbec4bc68c -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I4cfe5d9b111a6896378850e98bbc4cbaa14777aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 06:51:44 +00:00
TreeHugger Robot ba4caa1226 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3466bf399f -s ours am: d789af8fa1 -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I4066d2670f5c6003e7cce00cbae3ebc9bbc8effc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 06:51:39 +00:00
TreeHugger Robot 862f3e9714 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 25e3bfb284 -s ours am: 18306199f1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c9a44366231668909d50326e5dd416e4861fe00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 06:51:37 +00:00
TreeHugger Robot c5dd2a9ba1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 25e3bfb284 -s ours am: 99fe54c872 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic3145f33b1a4ea80f73dda2d735c3d972e327a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 06:51:32 +00:00
Bill Yi 1781b0aa13 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3a6e8b09a3 -s ours am: a1a3996434 -s ours
am skip reason: subject contains skip directive

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

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

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

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

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

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

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

Change-Id: I530ae278a0ce5ff7960b3c4d5cf5ac7419d79259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 06:50:54 +00:00
TreeHugger Robot d789af8fa1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3466bf399f -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: I4bd61035670db73d83baa4650659446c76255117
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 06:13:13 +00:00
TreeHugger Robot 99fe54c872 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 25e3bfb284 -s ours
am skip reason: subject contains skip directive

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

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

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

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

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

Change-Id: I4166e8ee60e80b92ca2ecc1f32e61d954b058417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 06:12:25 +00:00
TreeHugger Robot dbec4bc68c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 3466bf399f -s ours
am skip reason: subject contains skip directive

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

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

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

Change-Id: If9eea2c1ab8bbeb210a566e5848d330f65337812
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 06:11:43 +00:00
TreeHugger Robot 18306199f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 25e3bfb284 -s ours
am skip reason: subject contains skip directive

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

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

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

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

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

Change-Id: Id2803c2145341b6d75faa430505ccbd422f23719
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-23 06:10:56 +00:00
TreeHugger Robot 3466bf399f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-23 05:47:36 +00:00
TreeHugger Robot 25e3bfb284 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-08-23 05:47:36 +00:00
Bill Yi e70eb221ab Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ic555055ed443e8c803471f079827e5b72e82f657
2022-08-21 23:18:43 -07:00
Bill Yi 3a6e8b09a3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib4070acbfaee8ed9e40712f9deb8d04faa75f74e
2022-08-21 23:16:54 -07:00
Bill Yi a1185c5274 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2a6ffec908adcd335edec9cfdaac7738c1329c91
2022-08-21 23:14:59 -07:00
Thales Lima 6c896e7430 Show resize handle on cancel widget drop am: 51e1bc2212
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19642278

Change-Id: Ibd3e5e3e34b7ff4b6290fa343edbfac98b04d657
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-18 19:01:57 +00:00
Xin Li 06786ebd81 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: b62600b8c3 -s ours am: 321867f810 -s ours
am skip reason: Merged-In I23b04f4b124a7342007f92f7c10b79b1c50a31a2 with SHA-1 dd1617cdeb is already in history

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

Change-Id: I4c2ce8f145d59f6425f6a05373b42ef87df65add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:09:26 +00:00
Xin Li a07f42166c [automerger skipped] DO NOT MERGE - Merge Android 13 am: 79fabd3046 -s ours am: 8a3ad25ec7 -s ours
am skip reason: Merged-In I23b04f4b124a7342007f92f7c10b79b1c50a31a2 with SHA-1 dd1617cdeb is already in history

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

Change-Id: I5d5fddc40e920fb312f5d957d3df69e5d339ad2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 23:09:25 +00:00
Xin Li 321867f810 [automerger skipped] Merge "DO NOT MERGE - Merge Android 13" am: b62600b8c3 -s ours
am skip reason: Merged-In I23b04f4b124a7342007f92f7c10b79b1c50a31a2 with SHA-1 dd1617cdeb is already in history

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

Change-Id: If1885c4eb12d4585070f99f224ec3bff867ad827
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 22:45:16 +00:00
Xin Li 8a3ad25ec7 [automerger skipped] DO NOT MERGE - Merge Android 13 am: 79fabd3046 -s ours
am skip reason: Merged-In I23b04f4b124a7342007f92f7c10b79b1c50a31a2 with SHA-1 dd1617cdeb is already in history

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

Change-Id: I7bc317f5f6a87d00123a643a8602e4162fd28a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 22:45:15 +00:00
Stefan Andonian a434cd433c Fix for bug where expensive launcher animations were being paused and never resumed. am: c784f76c0d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19607738

Change-Id: I7125400ec07bd16eba3aca633e678b83cb2f6736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 19:51:56 +00:00
Xin Li b62600b8c3 Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:20 +00:00
Thales Lima 51e1bc2212 Show resize handle on cancel widget drop
Fix: 233834133
Test: manual on handheld and large screens, until we have create a way to resize widgets in TAPL b/241385885

Change-Id: I427dfaadd219d33a5371c3ae92c4e2311d3d3c6a
(cherry picked from commit 84fa75cc7d)
Merged-In: I427dfaadd219d33a5371c3ae92c4e2311d3d3c6a
2022-08-16 18:45:12 +00:00
Xin Li 79fabd3046 DO NOT MERGE - Merge Android 13
Bug: 242648940
Merged-In: I23b04f4b124a7342007f92f7c10b79b1c50a31a2
Change-Id: Iaef0bf6197211683957b35de65f4457bb20d783b
2022-08-15 22:04:30 -07:00
Stefan Andonian c784f76c0d Fix for bug where expensive launcher animations were being paused and never resumed.
Bug: 240623130
Test: Verified on device that the issue is not reproducible after fix.
Change-Id: I7b1e2f70fd75b1eddf340a4f85465cc6d5b65f73
(cherry picked from commit 8b336195a6)
2022-08-12 17:21:47 +00:00
TreeHugger Robot b3403466ba [automerger skipped] Merge changes from topic "fabFixMoveToTM" into tm-dev am: e2fd4e4e43 am: 4bc96f4854 -s ours
am skip reason: Merged-In I363c98c23f84fe570ea9cb1a40128359f5b67c9f with SHA-1 42b640404a is already in history

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

Change-Id: Ia582db3047a07f7a5430090587c431f13343c17c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 20:07:01 +00:00
Sunny Goyal 1183b36647 Fixing tab width and panner not aligned with the all-apps icons am: 524f4c4fba am: 3c6cf97c85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19432064

Change-Id: I700e4044a866a5a64a0b7ed99ebbd043d733ed54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 20:07:00 +00:00
TreeHugger Robot 8b22206b9c Merge changes from topic "fabFixMoveToTM" into tm-dev am: e2fd4e4e43 am: 5e9ff9eaa1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19432065

Change-Id: I0e04b2c39bc15fba57c6c943cb6e0256e5982f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 20:06:50 +00:00
Sunny Goyal 3deba5358a Fixing tab width and panner not aligned with the all-apps icons am: 524f4c4fba am: fb2be66008
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19432064

Change-Id: I7dcd3d5a4f874314a7dc8e9cc11fb8166c90c29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 20:06:49 +00:00
TreeHugger Robot 5e9ff9eaa1 Merge changes from topic "fabFixMoveToTM" into tm-dev am: e2fd4e4e43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19432065

Change-Id: I63b05d4643a6e545ab8f0ad53ac4c077400edad9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 19:41:43 +00:00
Sunny Goyal fb2be66008 Fixing tab width and panner not aligned with the all-apps icons am: 524f4c4fba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19432064

Change-Id: Ifcf3ecd483dda14cf01028cec268e10e56aba6ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 19:41:42 +00:00
TreeHugger Robot 4bc96f4854 Merge changes from topic "fabFixMoveToTM" into tm-dev am: e2fd4e4e43
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19432065

Change-Id: I82f4c1b70fd48b4cb1699fa2398810fc7e6bd9a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 19:40:32 +00:00
Sunny Goyal 3c6cf97c85 Fixing tab width and panner not aligned with the all-apps icons am: 524f4c4fba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/19432064

Change-Id: I858cff6a00a303aee66a93c7c8e5776d4ef41b4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 19:40:27 +00:00
TreeHugger Robot e2fd4e4e43 Merge changes from topic "fabFixMoveToTM" into tm-dev
* changes:
  Removing tabWidth calculation and using DeviceProfile directly
  Fixing tab width and panner not aligned with the all-apps icons
2022-08-09 19:16:58 +00:00
Automerger Merge Worker cc182042af Merge changes from topic "am-c036cb8107fa4697ae97e16bc8c57a94" into tm-d1-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2282ad0480 -s ours am: 8d682fb72c -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fe3df2f33 -s ours am: 014c9e2241 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 486c139776 -s ours am: f1d41f854c -s ours
2022-08-08 14:45:54 +00:00
Bill Yi 97158dcb9d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2282ad0480 -s ours am: 8d682fb72c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3fa9008831da8de37f49271730c3b69aac312278
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:43:19 +00:00
Bill Yi c6c874dc0f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1fe3df2f33 -s ours am: 014c9e2241 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I336ed92461e8ab95f66df9b37d25d4369db80b6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:43:07 +00:00
Bill Yi 4965affdb1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 486c139776 -s ours am: f1d41f854c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6ecfde9078d28d63c5827fc4434102b6f74ca6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:42:53 +00:00
Bill Yi c88d7ff609 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 2282ad0480 -s ours am: ab0e913696 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida5682fff4b44170263c4c837b82a7f0a2a658aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:42:52 +00:00