PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,436 Commits 1 Branch 0 Tags
67fa00189dcafe5df7ebc08c3dd1e6ccc2a7e276
Commit Graph

58436 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sunny Goyal 879040f336 Merge "Creating the transaction on the UI thread" into tm-dev am: 279911fafc am: f6df7d76ee am: d44ac1b464 am: 62797d14aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18591002

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

Change-Id: If4ae5eb87855dfd661d2144ecb0bda9b9acc5224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 02:14:10 +00:00
TreeHugger Robot 5c61f8126a 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: Ie055400a5c53670252982301dcee8b1b8e76dd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 02:12:56 +00:00
Sunny Goyal 052d1dbe15 Merge "Creating the transaction on the UI thread" into tm-dev am: 279911fafc am: f6df7d76ee am: 6d6defb472 am: f9445445f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18591002

Change-Id: I2d5063d4c709bbdc211e4b6c4c94df9d2bf545de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 02:12:41 +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
Android Build Coastguard Worker 03b2c1d6ef Snap for 8641798 from 6329b20f43 to tm-qpr1-release 
Change-Id: I4c040dd50d5369aa5ae7ef2d56fa721aaf5c7c07
 2022-05-26 01:25:04 +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
Android Build Coastguard Worker a1b5dfef57 Snap for 8642511 from 9557b10c59 to tm-release 
Change-Id: I87032e38b61377e0e774e4f14bfe84a1f25b3593
 2022-05-25 23:24:23 +00:00
Schneider Victor-tulias 08355d9a65 Merge "Add screen recording to drag to splitscreen taskbar tests to help with debugging." into tm-dev am: 467f30dbb7 am: 87313cb18c am: 1143f05cb2 am: e7d728bc70 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18529596

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

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

Change-Id: Idbf4875f384b2fe9d3b1778a94c4a4a87e75c302
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 23:11:06 +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
Sunny Goyal 33a58f248e 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: Ic51cc1a24c0b1818d7731a89c8ae091aa788e923
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 22:43:32 +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
Sukesh Ram 354fe14cd4 Made popupContainer's shadow & arrow visible in secondary display 
Reduced elevation of app drawer to 0dp because it was conflicting with popup container elevation

Test: Manual
Change-Id: I222866ddfc44ebf9ecd9787bb448e502339a1688
Fix: 233932585
 2022-05-25 21:36:48 +00: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
Brian Isganitis a152b8856a [automerger skipped] Merge "Have separate DeviceProfile instances for taskbar and all apps windows." into tm-qpr-dev am: 0bc68242ee am: 938a46e377 -s ours 
am skip reason: Merged-In Ia09f674ada9e445c1d7278fa94c536ea9de13ef9 with SHA-1 76900ac58a is already in history

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

Change-Id: I20fd702fe7296c140cd2ba90f6c444664bc57ae3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 21:24:31 +00:00
Schneider Victor-tulias 101d7e9699 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: Iddfa42484bf629568ba56c056d861582f7ecffa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 21:23:25 +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
TreeHugger Robot 1c5fd699a2 Merge "Attempt to preload the Launcher activity when the user reaches the All Set Page." into tm-dev am: 9557b10c59 am: 60273b856b am: 809d356a79 am: dc90b397b9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18400686

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

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

Change-Id: Ib433d6482c6b77838751ef806f00448df8fdf1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:46:56 +00:00
Bill Yi 93c4349f07 [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: cbad3c5224 -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: I587b7ba10483b78dfea56486326533cc8b4481d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:46:42 +00:00
TreeHugger Robot 9324bba29e Merge "Attempt to preload the Launcher activity when the user reaches the All Set Page." into tm-dev am: 9557b10c59 am: 60273b856b am: 6687578d1e am: 906e65954d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18400686

Change-Id: I3cee7b4275c48cd4611282296a8902ea36f3f51b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:45:28 +00:00
Automerger Merge Worker 958becdd0b Merge changes from topic "am-1f81d4e1bbf440c4b1a2b336aefd3506" into tm-qpr-dev-plus-aosp am: 0939c91c7c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18589959

Change-Id: Ic937006767516c955e95e60281ea2e721939ddb1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:43:30 +00:00
Bill Yi 1628488ad4 [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: 855b32c48c -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: Ia6e55b45e968a3d193fcc95e47e000f4210412fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:43:18 +00:00
Bill Yi 38cc864284 [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: c29171cb33 -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: I38ef79f1a9406c975090bee88895a55b3b41be27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:36:11 +00:00
Bill Yi 08961b9fff [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 16026ae9f9 -s ours am: afb10f5dd8 -s ours am: 87bb488669 -s ours am: 4d44623ddb -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: I66aed480d5dcb5d03f5eeb43e374a492ea777607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:36:05 +00:00
Bill Yi c65d1b6506 [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: 4003d07baf -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: I4a6b067b31848c8a5bc561445256ce18ab08ec8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:35:52 +00:00
Bill Yi 0f21e2e970 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dbaeaa5c05 -s ours am: c03707aade -s ours am: ad49c16f74 -s ours am: 7244670a18 -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: I1aa372950b4425c0b697d0fab500c5ea69894865
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-25 20:35:39 +00:00
Automerger Merge Worker 6b5d606227 Merge "Merge "Add type TYPE_ADD_TO_HOME_CONFIRMATION to AbstractFloatingView" into tm-dev am: d18c5085c5 am: 17318edce5" into tm-d1-dev-plus-aosp am: 13e6a84a9d am: df66efb71b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18457403

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