PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,925 Commits 1 Branch 0 Tags
ccf503c0a16f5180cd8e2d4136660beab94deef7
Commit Graph

49925 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Chau 8dd16455be Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b744 am: 9f368706cf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18598420

Change-Id: I29bc965166a94cc922bef33205d98897d4b23b6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:43:20 +00:00
Alex Chau acd748c224 Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b744 am: 8738a8ace7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18598420

Change-Id: I4f59b7ea316c7b6f8ad07cd79d0ebaa2569c909c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:43:19 +00:00
Alex Chau aac2a1b907 [automerger skipped] Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b744 am: 8738a8ace7 -s ours 
am skip reason: Merged-In Id65842f506eb342105082649446eb694cd5c33a4 with SHA-1 51da219869 is already in history

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

Change-Id: I9237796d845fa117549ac893b3fee75f0da0479e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:42:35 +00:00
Alex Chau 8738a8ace7 Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b744 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18598420

Change-Id: Iddbec64dd52c57bd5bee48575753e2ac6100abd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:07:06 +00:00
Alex Chau 9f368706cf Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b744 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18598420

Change-Id: I4d3a292663b1c65b3da8a9175abc4f74995239fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 15:05:02 +00:00
Alex Chau 56e367b744 Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev 2022-05-26 09:24:23 +00:00
TreeHugger Robot 46646b4c04 Merge "Allows work apps to be dragged down while work edu is showing." into tm-dev am: c907fd0a17 am: bf3e735e9e am: 51d3cd635a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18605850

Change-Id: Icf7796edaa1038cb225153b29228e35314d5a603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 03:30:56 +00:00
TreeHugger Robot dd10e5b573 Merge "Allows work apps to be dragged down while work edu is showing." into tm-dev am: c907fd0a17 am: bf3e735e9e am: 010118f6df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18605850

Change-Id: I4e37be1cbdcb2f855d051c21c83e6bf848c7f4c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 03:05:49 +00:00
TreeHugger Robot 7e31517a2d Merge "Allows work apps to be dragged down while work edu is showing." into tm-dev am: c907fd0a17 am: 1bdcde8920 am: e3bbcaa7de 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18605850

Change-Id: I260bdee92c7c8a38427efce79ade969151f1f0c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 03:03:41 +00:00
TreeHugger Robot 51d3cd635a Merge "Allows work apps to be dragged down while work edu is showing." into tm-dev am: c907fd0a17 am: bf3e735e9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18605850

Change-Id: I501f98722998c9372b12aa7cf618a6ca14f659b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 02:53:45 +00:00
TreeHugger Robot 010118f6df Merge "Allows work apps to be dragged down while work edu is showing." into tm-dev am: c907fd0a17 am: bf3e735e9e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18605850

Change-Id: Ic8a95a778b9894c4887a1fbf0f7a5d1c201cf85b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 02:51:38 +00:00
TreeHugger Robot e3bbcaa7de Merge "Allows work apps to be dragged down while work edu is showing." into tm-dev am: c907fd0a17 am: 1bdcde8920 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18605850

Change-Id: I8b7274d6a7cedfbf617a1f2d40236c497c4f614c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 02:40:30 +00:00
TreeHugger Robot bf3e735e9e Merge "Allows work apps to be dragged down while work edu is showing." into tm-dev am: c907fd0a17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18605850

Change-Id: I8f5648da9e85f10219e93803d7d6f5f5e8124a51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 02:21:49 +00:00
Jeremy Sim 9925e19b55 Merge "Fix Overview screenshot bug in fake landscape" into tm-qpr-dev am: a930633884 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18590120

Change-Id: I5cc50d242590853272bdfa4a4a0b1cfea94343ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 02:20:22 +00:00
TreeHugger Robot 1bdcde8920 Merge "Allows work apps to be dragged down while work edu is showing." into tm-dev am: c907fd0a17 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18605850

Change-Id: Ic20dc9a52263e4892c2731f364eedbe90d10b3ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 02:11:40 +00:00
Jeremy Sim a930633884 Merge "Fix Overview screenshot bug in fake landscape" into tm-qpr-dev 2022-05-26 01:02:20 +00:00
TreeHugger Robot c907fd0a17 Merge "Allows work apps to be dragged down while work edu is showing." into tm-dev 2022-05-26 00:06:08 +00:00
Sunny Goyal 62797d14aa Merge "Creating the transaction on the UI thread" into tm-dev am: 279911fafc am: f6df7d76ee am: d44ac1b464 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18591002

Change-Id: I483462fe17fb6ca2e53e03db5e4409912f6a66f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 23:37:40 +00:00
Sunny Goyal bc20319629 Merge "Creating the transaction on the UI thread" into tm-dev am: 279911fafc am: dc497cb1a4 am: 2e988c0e46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18591002

Change-Id: I682fadcc39e3cd8b4194a116d9531ef274a97721
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 23:37:06 +00:00
Sunny Goyal f9445445f2 Merge "Creating the transaction on the UI thread" into tm-dev am: 279911fafc am: f6df7d76ee am: 6d6defb472 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18591002

Change-Id: Ie77bdd83c3fc68e0089a8f63f9cd7dc4e3609e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 23:36:18 +00:00
Sunny Goyal d44ac1b464 Merge "Creating the transaction on the UI thread" into tm-dev am: 279911fafc am: f6df7d76ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18591002

Change-Id: Ie812b1c38fee8d52f5be897d0e0d7508924c86ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 23:11:16 +00:00
Sunny Goyal 2e988c0e46 Merge "Creating the transaction on the UI thread" into tm-dev am: 279911fafc am: dc497cb1a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18591002

Change-Id: I914399c03f0addcb279999caf2d1daf96c80f0d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 23:11:02 +00:00
Sunny Goyal 6d6defb472 Merge "Creating the transaction on the UI thread" into tm-dev am: 279911fafc am: f6df7d76ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18591002

Change-Id: I833d70f3d0fa24020ef6eed3394f3c84e6afb5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 23:11:01 +00:00
Jeremy Sim aba72f50b9 Fix Overview screenshot bug in fake landscape 
Fixes an issue where the user would not be able to take a screenshot through the Overview menu when:
1) the task thumbnail was in LiveTile mode and
2) the phone was in fake landscape.

The issue arose because all Overview menu items, upon selection, were forcing LiveTile to end immediately, even before running the onClick method of each menu item. In the case of screenshots, this resulted in the onClick method being unable to take a screenshot because LiveTile was already ended.

This fix prevents Overview menu items from always forcing LiveTile to end, instead allowing each onClick method to determine its own order of operations and end LiveTile when appropriate. The functionality of all other current menu items (Select, Split, etc) should not be affected by this change.

Fixes: 231047451
Test: Manual
Change-Id: Ibfc79a114718fc4674dc434a907044184c7f5dd0
 2022-05-25 15:48:59 -07:00
Sunny Goyal f6df7d76ee Merge "Creating the transaction on the UI thread" into tm-dev am: 279911fafc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18591002

Change-Id: Id4e379b1d90705e6048b732658bf7bc89e37c791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 22:44:36 +00:00
Schneider Victor-tulias e7d728bc70 Merge "Add screen recording to drag to splitscreen taskbar tests to help with debugging." into tm-dev am: 467f30dbb7 am: 87313cb18c am: 1143f05cb2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18529596

Change-Id: Ib3d3d4ec787d54c37367584a485fe1c22c10a8c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 22:43:52 +00:00
Schneider Victor-tulias 726632b034 Merge "Add screen recording to drag to splitscreen taskbar tests to help with debugging." into tm-dev am: 467f30dbb7 am: b210664095 am: 05e1ab4efc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18529596

Change-Id: I93df724514103e8427ea9c084ec2a37c396348c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 22:43:26 +00:00
Sunny Goyal dc497cb1a4 Merge "Creating the transaction on the UI thread" into tm-dev am: 279911fafc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18591002

Change-Id: I6e5433d99d7fe5d5a8a6b1c4c2fea66ece22a95a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 22:43:23 +00:00
Schneider Victor-tulias 5b42ed40f7 Merge "Add screen recording to drag to splitscreen taskbar tests to help with debugging." into tm-dev am: 467f30dbb7 am: b210664095 am: 8c8b35c368 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18529596

Change-Id: I3a68dc557d4eae2c7e58d41f2e5aaaa73e2d52a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 22:43:11 +00:00
Sunny Goyal 279911fafc Merge "Creating the transaction on the UI thread" into tm-dev 2022-05-25 22:24:04 +00:00
Schneider Victor-tulias 1143f05cb2 Merge "Add screen recording to drag to splitscreen taskbar tests to help with debugging." into tm-dev am: 467f30dbb7 am: 87313cb18c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18529596

Change-Id: I854279692a088631dc224c4605e7488170c7137a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 21:59:39 +00:00
Schneider Victor-tulias 05e1ab4efc Merge "Add screen recording to drag to splitscreen taskbar tests to help with debugging." into tm-dev am: 467f30dbb7 am: b210664095 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18529596

Change-Id: I5d87d98284f5405d62c289b929f5237080665f11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 21:59:33 +00:00
Schneider Victor-tulias 8c8b35c368 Merge "Add screen recording to drag to splitscreen taskbar tests to help with debugging." into tm-dev am: 467f30dbb7 am: b210664095 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18529596

Change-Id: If00b8b6ff429556e7860089b855bac390983c37d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 21:59:30 +00:00
Andy Wickham ff3721fe96 Allows work apps to be dragged down while work edu is showing. 
Also fixes jumpiness of the personal/work tabs while scrolling
with this card showing.

Cause: AllAppsRecyclerView#getCurrentScrollY() calculates the
current scroll based on the top of the first item in the view.
This is used to determine if pulling down should move the
container (if you are scrolled to the top), and it is also used
to align the personal/work tabs as you scroll down (they stop
moving when the top item reaches their bottom).

Fix: The top of the Work Edu card was lower than the top of the
recycler view because it was offset by a top margin. Switching
this to padding in the card's container fixes the associated
calculations while keeping the visual positioning from before.

Fix: 233836148
Test: Manually tried dragging down and scrolling. Tried it with
and without my refactor.

Change-Id: Idaf4b3801174c1dfeceda5c0f112e405908e856d
 2022-05-25 14:55:39 -07:00
Schneider Victor-tulias b210664095 Merge "Add screen recording to drag to splitscreen taskbar tests to help with debugging." into tm-dev am: 467f30dbb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18529596

Change-Id: I547601f2ba018fd3d91ecf46644deaa5c83f8a87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 21:24:37 +00:00
Schneider Victor-tulias 87313cb18c Merge "Add screen recording to drag to splitscreen taskbar tests to help with debugging." into tm-dev am: 467f30dbb7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18529596

Change-Id: I74743963b18e905a13626bae3b4461061447a14b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 21:23:01 +00:00
Schneider Victor-tulias 467f30dbb7 Merge "Add screen recording to drag to splitscreen taskbar tests to help with debugging." into tm-dev 2022-05-25 21:03:04 +00:00
Brian Isganitis 938a46e377 Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-qpr-dev am: 0bc68242ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18579641

Change-Id: I6acd213ac6107b7117769b8a24f05537ba096110
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:58:24 +00:00
Brian Isganitis 0bc68242ee Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-qpr-dev 2022-05-25 20:27:21 +00:00
TreeHugger Robot dc90b397b9 Merge "Attempt to preload the Launcher activity when the user reaches the All Set Page." into tm-dev am: 9557b10c59 am: 60273b856b am: 809d356a79 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18400686

Change-Id: I6b1d4132105fb845aed4e5651204bd9a1da65ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:17:37 +00:00
TreeHugger Robot 9bd1c7dd60 Merge "Attempt to preload the Launcher activity when the user reaches the All Set Page." into tm-dev am: 9557b10c59 am: 177b7150e9 am: 2ae3d3b427 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18400686

Change-Id: I6e2f0ed3ca9072273ca3da4f6563c3b3e9e07797
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:17:18 +00:00
Automerger Merge Worker 5f04c039c1 Merge changes from topic "am-b26f2cb44c53490f868637cd5d96ec61" into tm-d1-dev-plus-aosp am: 53ed413161 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18589959

Change-Id: I719c37f6fd8c075eb2cd8bde26a00b317af36f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:15:02 +00:00
Bill Yi cbad3c5224 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 06d2238892 -s ours am: 3d3b43ed36 -s ours am: 65440d00d0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id2c672eeb7292f71271c6b139ac23ec50a3b9a58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:14:47 +00:00
TreeHugger Robot 906e65954d Merge "Attempt to preload the Launcher activity when the user reaches the All Set Page." into tm-dev am: 9557b10c59 am: 60273b856b am: 6687578d1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18400686

Change-Id: I240c5d6d2da0aec243f8bbeee682588290e17fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:14:11 +00:00
Automerger Merge Worker 0939c91c7c Merge changes from topic "am-1f81d4e1bbf440c4b1a2b336aefd3506" into tm-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 06d2238892 -s ours am: 3d3b43ed36 -s ours am: 7352c95ac7 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16026ae9f9 -s ours am: 2973e09d0a -s ours am: 3784ca14a9 -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e965dfe6eb -s ours am: a0be0c8ae5 -s ours am: 17b3d8cd69 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dbaeaa5c05 -s ours am: 9fdf6d1f15 -s ours am: 6b17e15c8c -s ours
 2022-05-25 20:12:38 +00:00
Bill Yi c29171cb33 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 06d2238892 -s ours am: 13dd1391ff -s ours am: 5665bd7a53 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I62e91f667dca7b6d81d5d9ad9414618d14375489
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:39 +00:00
Bill Yi 4d44623ddb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16026ae9f9 -s ours am: afb10f5dd8 -s ours am: 87bb488669 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c8bb31eeb22b06935f19ac918dd244919c3c40f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:32 +00:00
Bill Yi 4003d07baf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: e965dfe6eb -s ours am: 544df19191 -s ours am: 3bcfcce858 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f53f1eecc593303d7752b0b9c1315fd1e5cf592
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:17 +00:00
Bill Yi 7244670a18 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dbaeaa5c05 -s ours am: c03707aade -s ours am: ad49c16f74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I84b556266f3bde7385c44c6bb13d95a082260931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:11:03 +00:00
Bill Yi 855b32c48c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 06d2238892 -s ours am: 3d3b43ed36 -s ours am: 7352c95ac7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ice0f7a7882ad3247321c7f6f658d8654468b4e28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:10:54 +00:00