Commit Graph

48866 Commits

Author SHA1 Message Date
Anushree Ganjam ef948994bc Merge "Add "incrementEventCountBy" function to OnboardingPrefs." into tm-dev am: 218703d5a9 am: fb7d3db86b am: 45745f738f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18500283

Change-Id: I8a07a1b658d9db6faedad1819109b365120e36c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 04:10:11 +00:00
Cherry Ng 4367d681f4 Merge "Revert "Add "incrementEventCountBy" function to OnboardingPrefs."" into tm-dev am: 6a4ea4c849 am: f05363a7d4 am: f99be83c10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18568158

Change-Id: I693da36a556d3a57be82397d09a1d0097575dbfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 04:09:45 +00:00
TreeHugger Robot 075740a850 Merge "Do not launch home disambiguation screen when home is not known" into tm-qpr-dev am: 4c48d57434
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18566763

Change-Id: I79d1dfba8793fe125abcde6c667005dce7666847
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 04:02:43 +00:00
Anushree Ganjam 45745f738f Merge "Add "incrementEventCountBy" function to OnboardingPrefs." into tm-dev am: 218703d5a9 am: fb7d3db86b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18500283

Change-Id: I6da113b9397bc99c408cca18deb64f7fbeb4478b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 04:00:39 +00:00
TreeHugger Robot 792e5a7384 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6112a28b0b -s ours am: cb3a990157 -s ours am: 3ddec48384 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I644d389012f68a2c81cdeaf2be350dca0bde9e51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 03:59:28 +00:00
Bill Yi 6613677c61 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c8c47778f -s ours am: a19f2ed182 -s ours am: f83bd48170 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I36ad0bb016081f59c4ef1dd299eaca7c51be57ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 03:59:13 +00:00
Anushree Ganjam 4756a8b9f0 Merge "Add "incrementEventCountBy" function to OnboardingPrefs." into tm-dev am: 218703d5a9 am: bfc82b027e am: 6367ff131c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18500283

Change-Id: I78a7f2cfc1e95f5a414fe6257ffbf622795c89b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 03:51:49 +00:00
Abhilasha Chahal c9be055748 Merge "Add LAUNCHER_SYSTEM_SHORTCUT_APP_SHARE_TAP event" into tm-dev am: 23dd0006ad am: a57630d1e0 am: 50d8cf6d5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18495984

Change-Id: Ia02416eaca92fa90d55618c8e6043564744a0085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 03:51:40 +00:00
Cherry Ng f99be83c10 Merge "Revert "Add "incrementEventCountBy" function to OnboardingPrefs."" into tm-dev am: 6a4ea4c849 am: f05363a7d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18568158

Change-Id: Iab89416c0c5db2dfeab117a04e2d82598f68d1e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 02:49:59 +00:00
Cherry Ng f05363a7d4 Merge "Revert "Add "incrementEventCountBy" function to OnboardingPrefs."" into tm-dev am: 6a4ea4c849
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18568158

Change-Id: I9492ed07aacb0a31eb64bd9f2dbaf6cbd7ae69be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 02:34:59 +00:00
Cherry Ng 6a4ea4c849 Merge "Revert "Add "incrementEventCountBy" function to OnboardingPrefs."" into tm-dev 2022-05-24 02:16:40 +00:00
TreeHugger Robot 4c48d57434 Merge "Do not launch home disambiguation screen when home is not known" into tm-qpr-dev 2022-05-24 02:03:09 +00:00
TreeHugger Robot be374fb433 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6112a28b0b -s ours am: cb3a990157 -s ours am: e8e064b17a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib39c65a5f8dff232ef38f816430f331dc14b112c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:43:16 +00:00
Bill Yi c20ebb8f4b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c8c47778f -s ours am: a19f2ed182 -s ours am: 3077d41a79 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ife5bcd717d3f88e941b6ee288d7d663554c911d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:43:01 +00:00
Anushree Ganjam 61b615da69 Merge "Add "incrementEventCountBy" function to OnboardingPrefs." into tm-dev am: 218703d5a9 am: bfc82b027e am: 9e0dd07bc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18500283

Change-Id: I56098534ca41874e2285d0ecd32311498fbd1448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:42:14 +00:00
TreeHugger Robot e8e064b17a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6112a28b0b -s ours am: cb3a990157 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic019c73b4dec167e8f3d9abc09f564cc559ccb21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:23:27 +00:00
TreeHugger Robot 3ddec48384 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6112a28b0b -s ours am: cb3a990157 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I312fcad3ac3821d72ca50dd263009b0f55e5bbf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:23:21 +00:00
Bill Yi 3077d41a79 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c8c47778f -s ours am: a19f2ed182 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e67bce5e24740f4fd980e5433278d3fc31c9229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:23:11 +00:00
Bill Yi f83bd48170 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c8c47778f -s ours am: a19f2ed182 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia5752b95c01f07afadfd94d786ddb2d12df0ff4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:23:07 +00:00
Anushree Ganjam 9e0dd07bc0 Merge "Add "incrementEventCountBy" function to OnboardingPrefs." into tm-dev am: 218703d5a9 am: bfc82b027e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18500283

Change-Id: I4017a49fc4ca802e668cc057735d1e033b3a7527
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:21:40 +00:00
Anushree Ganjam 6367ff131c Merge "Add "incrementEventCountBy" function to OnboardingPrefs." into tm-dev am: 218703d5a9 am: bfc82b027e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18500283

Change-Id: I2715b9694e6c49e5b6e593be05eff3cb77fcea96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:21:32 +00:00
Abhilasha Chahal 66a3735dac Merge "Add LAUNCHER_SYSTEM_SHORTCUT_APP_SHARE_TAP event" into tm-dev am: 23dd0006ad am: a57630d1e0 am: 9af4a44e03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18495984

Change-Id: I32b2279cc1bc49e2040f4f719b2e411b0a374543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:06:22 +00:00
Abhilasha Chahal 168fbc299d Merge "Add LAUNCHER_SYSTEM_SHORTCUT_APP_SHARE_TAP event" into tm-dev am: 23dd0006ad am: edc8f8a056 am: 1d972c003a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18495984

Change-Id: Ifac2459282557455400e395852f3e90032a0a536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:03:31 +00:00
TreeHugger Robot cb3a990157 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 6112a28b0b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98f894e8c329a4cd41248b4e6737efbe4bf11798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 01:00:11 +00:00
Bill Yi a19f2ed182 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3c8c47778f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I25108edb99bb4b01ead60019fc4680e090cee1cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 00:59:58 +00:00
Anushree Ganjam fb7d3db86b Merge "Add "incrementEventCountBy" function to OnboardingPrefs." into tm-dev am: 218703d5a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18500283

Change-Id: I1b77b618772e1f651c2732f5fb962894da222d1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 00:57:03 +00:00
Anushree Ganjam bfc82b027e Merge "Add "incrementEventCountBy" function to OnboardingPrefs." into tm-dev am: 218703d5a9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18500283

Change-Id: I3bb2ff1aa7ad2e8814837146eb6aa356c209f3e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-24 00:57:01 +00:00
Anushree Ganjam 514979dd2d Revert "Add "incrementEventCountBy" function to OnboardingPrefs."
Revert submission 18500283-dismissEduCard

Reason for revert: Reverting because of build failures.
Reverted Changes:
I727cefb70:Save the value to sharedPreference When edu card i...
I180ab3bd6:Add "incrementEventCountBy" function to Onboarding...

Change-Id: Ia39781c78776a629d4678c78dd4ca75f49abbb6d
2022-05-24 00:44:55 +00:00
TreeHugger Robot 6112a28b0b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-05-24 00:38:21 +00:00
Anushree Ganjam 218703d5a9 Merge "Add "incrementEventCountBy" function to OnboardingPrefs." into tm-dev 2022-05-23 23:55:36 +00:00
Sunny Goyal 4a35dd4f0d Do not launch home disambiguation screen when home is not known
Bug: 233071361
Test: Verified on device
Change-Id: I54e71e19363920b0778c328dc391575d0921f304
2022-05-23 23:30:58 +00:00
Abhilasha Chahal 9af4a44e03 Merge "Add LAUNCHER_SYSTEM_SHORTCUT_APP_SHARE_TAP event" into tm-dev am: 23dd0006ad am: a57630d1e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18495984

Change-Id: I1d31dca1e771ea9d14eca6b9252af90e7413f0d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 23:04:28 +00:00
Abhilasha Chahal 1d972c003a Merge "Add LAUNCHER_SYSTEM_SHORTCUT_APP_SHARE_TAP event" into tm-dev am: 23dd0006ad am: edc8f8a056
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18495984

Change-Id: I376bf5cb096a2ecf3fc9e33cd04ae451eed35804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 23:02:42 +00:00
Abhilasha Chahal 50d8cf6d5e Merge "Add LAUNCHER_SYSTEM_SHORTCUT_APP_SHARE_TAP event" into tm-dev am: 23dd0006ad am: a57630d1e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18495984

Change-Id: I244889069e40b3c737485a4c9eeb04905cb7d071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 23:02:24 +00:00
Abhilasha Chahal edc8f8a056 Merge "Add LAUNCHER_SYSTEM_SHORTCUT_APP_SHARE_TAP event" into tm-dev am: 23dd0006ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18495984

Change-Id: Ic972e5d135cb2f64c2b44c296be9942e1acc15d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 22:32:39 +00:00
Abhilasha Chahal a57630d1e0 Merge "Add LAUNCHER_SYSTEM_SHORTCUT_APP_SHARE_TAP event" into tm-dev am: 23dd0006ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18495984

Change-Id: I9e054e9ebd21382bc3692959d26c9874fa4fd44a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 22:31:19 +00:00
Jeremy Sim ce47e5bf9c Implement non-disappearing View for split staging instructions am: b0cce86385
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18337640

Change-Id: I9528d19875838af2cd6df93c503ac2275e66187f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 22:24:38 +00:00
Abhilasha Chahal 23dd0006ad Merge "Add LAUNCHER_SYSTEM_SHORTCUT_APP_SHARE_TAP event" into tm-dev 2022-05-23 21:44:27 +00:00
Jeremy Sim b0cce86385 Implement non-disappearing View for split staging instructions
The instructions for how to perform a splitscreen operation, previously conveyed through a disappearing Toast, are now conveyed through a custom View object.

Fixes: 219987907
Test: Manual
Change-Id: Iff2bb6e334e0325e8a091d76a5f9b8767071365f
2022-05-23 21:23:22 +00:00
Bill Yi 7d23d23276 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fbe7a74f05 -s ours am: ab218eccd7 -s ours am: 240e357907 -s ours am: 92e96a5835 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9f3b9feaf4190c3b3129aa36df31a5436e1106da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:09:58 +00:00
Bill Yi 8c20b34050 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fbe7a74f05 -s ours am: ab218eccd7 -s ours am: 8b1cd47490 -s ours am: aede62a228 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8633d6aede86bcef178e10d4b855cf0708dd98ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:09:06 +00:00
Alex Chau 073462ff5b Merge "Update drop target button alignment across devices" into tm-dev am: 618047355d am: 15ca7e759b am: 4b6d2764b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18557384

Change-Id: I25d2e6b09fd066af8fda9c849dc99b0dac2c412c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:08:42 +00:00
Alex Chau adbf45cd47 Merge "Update drop target button alignment across devices" into tm-dev am: 618047355d am: 53cc41a036 am: 99e9b07486
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18557384

Change-Id: Ib51176f965fd78f71c07935bcb819d4f5124e6e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:08:36 +00:00
Automerger Merge Worker 594f8836a8 Merge changes from topic "am-5ab8b98d744945ad9ca21a34f2809719" into tm-d1-dev-plus-aosp am: 9195744810
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18515846

Change-Id: Ie99de4bba9672725fa9d05d42d53cf26623c431c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:05:17 +00:00
TreeHugger Robot b76d2a2301 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 84f3b75c71 -s ours am: 6defcfd17e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id26db6f9fb5e5ca4a35d39bd3b84faabbd6f992e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:05:05 +00:00
Brandon Dayauon efb85006d7 Merge "Label is no longer Unlabeled. Now says "closed"" into tm-dev am: 3e4d9c79d5 am: 21261e1682 am: d3a29d9817
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18458656

Change-Id: I21646891add8513182df6965931adeb40ed12261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:03:59 +00:00
Brandon Dayauon cf7faeaa64 Merge "Label is no longer Unlabeled. Now says "closed"" into tm-dev am: 3e4d9c79d5 am: d2a0279b11 am: 8bb4a3839a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18458656

Change-Id: Ib3450b4c1f04cdf2410916fcb236d9953696546a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:03:53 +00:00
Bill Yi 92e96a5835 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fbe7a74f05 -s ours am: ab218eccd7 -s ours am: 240e357907 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If26941884e1ab07028787915f12b7f0ac0349837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 20:01:55 +00:00
Bill Yi da89a5c84e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fbe7a74f05 -s ours am: ab218eccd7 -s ours am: 8b1cd47490 -s ours am: f072b75964 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia66ef818f8beffadb7fdf32f2f488d63e38fd037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 19:46:10 +00:00
Alex Chau 3a5f40dc38 Merge "Update drop target button alignment across devices" into tm-dev am: 618047355d am: 15ca7e759b am: 1db078ee31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18557384

Change-Id: Ia713d32ba1c1395b38e021e7d395af5c3962d6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-23 19:44:29 +00:00