PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
60,459 Commits 1 Branch 0 Tags
4f69ca52efa7a94de67a2b9c4956e233dfb23d92
Commit Graph

60459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinit Nayak fa886a3edf Merge "Limit starting bounds of swipe to animation start rect" into tm-dev am: e8a4e0e2dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18607508

Change-Id: I1cd0d663d6183ff28a30993e4bc8c84688e055e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 03:11:02 +00:00
Vinit Nayak 4e40207246 Merge "Limit starting bounds of swipe to animation start rect" into tm-dev am: e8a4e0e2dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18607508

Change-Id: I7524fc3777b7db298adf846862f7184dfdb689c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 03:10:27 +00:00
TreeHugger Robot 086368e4fd Merge "[conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1" into tm-qpr-dev am: a7b4152e90 am: 731978a0a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18624669

Change-Id: Icf20a5e474e15c56962403cc4d9130d3289643aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 02:55:00 +00:00
Vinit Nayak e8a4e0e2dc Merge "Limit starting bounds of swipe to animation start rect" into tm-dev 2022-05-27 02:52:36 +00:00
TreeHugger Robot 731978a0a5 Merge "[conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1" into tm-qpr-dev am: a7b4152e90 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18624669

Change-Id: Ib4926dde7f34e27029b868663cb441641ef53b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-27 02:36:47 +00:00
TreeHugger Robot a7b4152e90 Merge "[conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1" into tm-qpr-dev 2022-05-27 02:13:14 +00:00
Android Build Coastguard Worker 29d89644a4 Snap for 8650774 from 7eee15f400 to tm-qpr1-release 
Change-Id: Icbd19b6deee80d1c58acd530ee556bd3a7a9a358
 2022-05-27 01:24:49 +00:00
Hyunyoung Song 6cc3a7b311 Merge "Convert make to bp" into tm-qpr-dev am: 7eee15f400 am: 8c456d6248 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18457406

Change-Id: I0ded33d55cf5595ba1338b3699c250c8f8db86f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 23:55:56 +00:00
Hyunyoung Song 8c456d6248 Merge "Convert make to bp" into tm-qpr-dev am: 7eee15f400 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18457406

Change-Id: I4b5d0658538a01c9086269f617dd7490c4af9e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 23:39:49 +00:00
Winson Chung 359cb5d1b6 Ensure page scrolls are initialized even for 0 children. 
Bug: 233713180
Test: Walk through CtsVerifier Lock Task UI flow as described in the bug
Change-Id: I49cb942a37a202b3e1b7ee00479d68402fcaf8b0
 2022-05-26 23:38:48 +00:00
Andy Wickham 49fb8efbd3 [conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1 am: 9fe363f16d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: Idda9dad08cb939a8e4ada7dc46b4af2ce103fdd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 23:38:38 +00:00
Andy Wickham c21c5dab1d [conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 2348a0bf9b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: If4d420338999aa0d794aa85241a6b552b4f2c1d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 23:37:03 +00:00
Andy Wickham a1ec03bdfe [conflict] Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: Ic7e380e21342011afcbd1ada0eb453dc83eff4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 23:31:31 +00:00
Android Build Coastguard Worker 25452d9917 Snap for 8649577 from 5ba5c76c76 to tm-release 
Change-Id: Id8d0e71d355181f5780344d4c3f83f18fd3d92db
 2022-05-26 23:24:21 +00:00
Hyunyoung Song 7eee15f400 Merge "Convert make to bp" into tm-qpr-dev 2022-05-26 23:14:04 +00:00
Automerger Merge Worker 78798a9999 Merge "Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: f79a5cf7da" into tm-d1-dev-plus-aosp 2022-05-26 22:16:26 +00:00
Andy Wickham dfea4d8672 Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: f79a5cf7da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: I01cd4f53cac1259e6d1fdf0ce2cedd5c32a4b195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 22:16:15 +00:00
Andy Wickham 9fe363f16d Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb am: 15dc59f8b1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: I97bef5b17f15cf500e545cc1d1ccd3e6031abadd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 22:16:09 +00:00
Andy Wickham 15dc59f8b1 Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: Ibcc128ec5f74a96978e0c65af79283997ac1db50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 22:00:44 +00:00
Andy Wickham 2348a0bf9b Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: Ic346d0af6df90c570ce1c718622981feb3ac792e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 21:59:43 +00:00
Andy Wickham f79a5cf7da Merge "Moves Search results into a separate RV (take 2)." into tm-dev am: 4ca247a6bb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18420827

Change-Id: Id20e41c851fcfd3ebbeb80d1f7013da8cc9ddfe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 21:59:18 +00:00
Vinit Nayak f7b4e7f497 Limit starting bounds of swipe to animation start rect 
* If the starting point is greater than that of the current
device's width (in either positive or negative direction),
reset the starting rect to be fullscreen task bounds
* More details at b/228829958#comment12

Fixes: 228829958
Test: Reboot device and swipe up from home immediately,
app doesn't fling from the side.
Tested with portrait and landscape launcher.
Tested with fake landscape launcher.

Change-Id: I6ea24e30e9de5716b7830f487b2ed63f56598c50
 2022-05-26 14:43:26 -07:00
Andy Wickham 4ca247a6bb Merge "Moves Search results into a separate RV (take 2)." into tm-dev 2022-05-26 21:41:55 +00:00
Tracy Zhou 0775878a85 Add ScreenRecord tag to understand in proc test failure am: 674ac75930 am: 31311d308c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18619727

Change-Id: Ic4c63d952f2100a1e96953306bb7e38d28db3ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 21:13:53 +00:00
Tracy Zhou 31311d308c Add ScreenRecord tag to understand in proc test failure am: 674ac75930 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18619727

Change-Id: Ifa793b652322e626426c645a0acd42cb77c8305b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 20:53:47 +00:00
Tracy Zhou 674ac75930 Add ScreenRecord tag to understand in proc test failure 
Bug: 233075289
Test: N/A
Change-Id: I22333f20f68692a352312bad034ce54def9c29ef
 2022-05-26 18:16:57 +00:00
Brandon Dayauon 9e321d3f01 Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: cd9cffe63d am: 039036693a am: fcc86fb1ed 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: I8ed62e5f2223b064f0c0455a36e4afc4ae2fe915
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:04:41 +00:00
Brandon Dayauon 56b53f04c1 Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: cd9cffe63d am: 0113cdbd86 am: a3fa538de6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: I653c746bf56143152757737156d77422a82bb479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:04:30 +00:00
Brandon Dayauon 2f1af6760c Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: 5d648fe1a4 am: f5d27abc10 am: bff9e92f86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: Ia5769438ed144b40c1880f4716577f72e3a83234
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 18:02:21 +00:00
Brandon Dayauon fcc86fb1ed Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: cd9cffe63d am: 039036693a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: I47db16a0ec4ef124a8b077c68cc5f8b0a9957a62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 17:42:20 +00:00
Brandon Dayauon a3fa538de6 Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: cd9cffe63d am: 0113cdbd86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: I31307159616bd71d25fe059ade4e87a642c038f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 17:39:38 +00:00
Brandon Dayauon bff9e92f86 Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: 5d648fe1a4 am: f5d27abc10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: Ib4de397fea24508b4139c6d037343620ad69bd14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 17:39:23 +00:00
Brian Isganitis afd72f0726 Have separate DeviceProfile instances for taskbar and all apps windows. 
We want to scale down the DeviceProfile for taskbar, but the all apps
window should rely on the original DeviceProfile.

Test: Manual
Fix: 232907361
Change-Id: Ia09f674ada9e445c1d7278fa94c536ea9de13ef9
Merged-In: Ia09f674ada9e445c1d7278fa94c536ea9de13ef9
(cherry picked from commit a9a78117c7)
 2022-05-26 17:21:50 +00:00
Brandon Dayauon 0113cdbd86 Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: cd9cffe63d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: I1667a40053a5f2ec1f1f283cae29c43b4f5ecc3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 17:15:05 +00:00
Brandon Dayauon f5d27abc10 Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: 5d648fe1a4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: Ic157dbf13a2122aa91825245e95247941a7a0cfb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 17:13:48 +00:00
Brandon Dayauon 039036693a Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: cd9cffe63d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: I9d35410f26d6e7ea42872e3029f51883aa65093e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 17:12:55 +00:00
Brandon Dayauon 9b42f62266 Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 am: 99c0fdc273 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: I3a1c665c4e2b0bf5fb36ea05a913b15b393abc1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:49:31 +00:00
Automerger Merge Worker 47ce157307 [automerger skipped] Merge "Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b744 am: 9f368706cf" into tm-d1-dev-plus-aosp am: c8c1dca053 -s ours am: 3069418670 -s ours 
am skip reason: Merged-In Id65842f506eb342105082649446eb694cd5c33a4 with SHA-1 e2e1509d55 is already in history

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

Change-Id: I32e46eeba858199b9b5656e57b659912f0c8c83d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:46:25 +00:00
Alex Chau 4a76f7864f [automerger skipped] Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b744 am: 9f368706cf am: 8dd16455be -s ours am: 2efcf4a7d6 -s ours 
am skip reason: Merged-In Id65842f506eb342105082649446eb694cd5c33a4 with SHA-1 e2e1509d55 is already in history

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

Change-Id: I08a706dabac6a5d7ee468128feff5ce6ba80a2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:46:24 +00:00
Brandon Dayauon 99c0fdc273 Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

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

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

Change-Id: I9d31567eb94423efa4245723350a17ce4eb0e889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:44:12 +00:00
Alex Chau 48da547c7a [automerger skipped] Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b744 am: 8738a8ace7 -s ours am: aac2a1b907 -s ours am: 1122f08f89 -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: I2b8ee66e477af72f70bdba51aa0ef2dec98918e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:42:31 +00:00
Brandon Dayauon cd9cffe63d Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: I6a941af90c0305da211c410d74b6e674d10ee0a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:40:57 +00:00
Brandon Dayauon 5d648fe1a4 Merge "fixed scalable grid allApps to match home screen icons in largest display size" into tm-dev am: 5ba5c76c76 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18512230

Change-Id: I2c7fddf4d1e44ea3a97f6a7aa782f7040d6ba91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:39:26 +00:00
Alex Chau 3d0e8622d3 [automerger skipped] Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b744 am: 516f9cab61 -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: Idd5dc4a7f41c6300361c280a98efd04580581b65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:39:17 +00:00
TreeHugger Robot 159418beac Merge "Allows work apps to be dragged down while work edu is showing." into tm-dev am: c907fd0a17 am: 5c61f8126a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18605850

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

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

Change-Id: Id5789f352c4a746401d4a98570d2f094a2a0cfcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:17:24 +00:00
Automerger Merge Worker 3069418670 [automerger skipped] Merge "Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b744 am: 9f368706cf" into tm-d1-dev-plus-aosp am: c8c1dca053 -s ours 
am skip reason: Merged-In Id65842f506eb342105082649446eb694cd5c33a4 with SHA-1 e2e1509d55 is already in history

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

Change-Id: I75d3a9a25a616c700821fa162df0c31940fdf19f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:11:11 +00:00
Alex Chau 2efcf4a7d6 [automerger skipped] Merge "Fix taskbar icon flicker and jump when transforming to hotseat" into tm-dev am: 56e367b744 am: 9f368706cf am: 8dd16455be -s ours 
am skip reason: Merged-In Id65842f506eb342105082649446eb694cd5c33a4 with SHA-1 e2e1509d55 is already in history

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

Change-Id: I2887bfd78e9b26210fb6b4725d23ab7a1f03cd1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-26 16:11:10 +00:00