Commit Graph

49925 Commits

Author SHA1 Message Date
The Android Open Source Project 1f0d0d73e0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 92b1c3965e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I67e6bbb6f401a980853fc436cd78115f000d7be2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 02:16:41 +00:00
Brian Isganitis bde366ddd1 Ignore swipe velocity if next task is considered the destination.
Test: Manual
Bug: 222117127
Change-Id: I5dc0d0a84aae275eebb59a64b59e5344b4b591c4
2022-05-10 17:36:07 -07:00
Ats Jenk 0d3772b65f Skip passing gesture to bubble when notif expanded
Notification panel can be expanded on top of expanded bubbles.
Bubbles remain expanded in the back.
Check for notification panel being expanded before passing home gesture
to bubbles.

Bug: 191565082
Test: atest PlatformScenarioTests:android.platform.test.scenario.sysui.bubble.NotificationPanelOverBubblesTest
Change-Id: I59c429cceca0cef764b9d4e36389f902005e8b09
2022-05-10 17:35:54 -07:00
Luca Zuccarini c5a9107912 Merge "Update the NORMAL->ALL_APPS transition when tapping on QSB on phones." into tm-dev am: e75b1c8a19 am: 51241c7dde am: 201282acf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18140267

Change-Id: Ia80e2f2eec850f35af4c9fba80a7569bdc6dcc80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:51:00 +00:00
Luca Zuccarini bb10b9ace1 Merge "Update the NORMAL->ALL_APPS transition when tapping on QSB on phones." into tm-dev am: e75b1c8a19 am: 0bedf7593c am: 951ad52273
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18140267

Change-Id: Ief96eb1d5e15004eb99fd0356fe4601ba1d77b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:50:53 +00:00
Luca Zuccarini cc898d57ed Merge "Update the NORMAL->ALL_APPS transition when tapping on QSB on phones." into tm-dev am: e75b1c8a19 am: 0bedf7593c am: eea75dd235
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18140267

Change-Id: I5eb16257ea6268db0964cbf349a407e77807715d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:50:39 +00:00
Luca Zuccarini 951ad52273 Merge "Update the NORMAL->ALL_APPS transition when tapping on QSB on phones." into tm-dev am: e75b1c8a19 am: 0bedf7593c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18140267

Change-Id: I7d45f64950ebc4edb639d22aab8c74bf79901d95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:26:28 +00:00
Luca Zuccarini 201282acf6 Merge "Update the NORMAL->ALL_APPS transition when tapping on QSB on phones." into tm-dev am: e75b1c8a19 am: 51241c7dde
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18140267

Change-Id: I607fe62851fb731f231deed394d7bad370294bb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:25:58 +00:00
Luca Zuccarini eea75dd235 Merge "Update the NORMAL->ALL_APPS transition when tapping on QSB on phones." into tm-dev am: e75b1c8a19 am: 0bedf7593c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18140267

Change-Id: Idc6fc604d05aa4fda6a8d25d555f684f58f127a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:25:46 +00:00
Luca Zuccarini 0bedf7593c Merge "Update the NORMAL->ALL_APPS transition when tapping on QSB on phones." into tm-dev am: e75b1c8a19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18140267

Change-Id: I84fb90863fa88c6c2e02feee3062ec466d1f294e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:07:43 +00:00
Luca Zuccarini 51241c7dde Merge "Update the NORMAL->ALL_APPS transition when tapping on QSB on phones." into tm-dev am: e75b1c8a19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18140267

Change-Id: If9190e647b05b8f2545e0a4951f21b05f9ab4b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 23:06:15 +00:00
Luca Zuccarini e75b1c8a19 Merge "Update the NORMAL->ALL_APPS transition when tapping on QSB on phones." into tm-dev 2022-05-10 22:35:02 +00:00
James O'Leary fee6f908eb Merge "Use T50 base instead of T95" into tm-dev am: 7ba0339b00 am: dc83690272 am: 60e8fe2c0e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167226

Change-Id: I7cd7f87f1fa9517ce79844d667817eafc0ccc63c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:34:57 +00:00
Becky Qiu 6d5e61ccea Merge "Fix the IndexOutOfBoundsException in AllAppsGridAdapter." into tm-dev am: 05eac3ee27 am: 3229ecc69b am: 71ae69b7c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206586

Change-Id: I1c20587229bfdc2acc271a9d56caeb28886b23d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:34:00 +00:00
Sunny Goyal 6d0bdade92 Merge "Fixing wrong alpha for disbled icon" into tm-dev am: 8ca6e815bd am: 48bcc5f7a5 am: c6564d06c0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18237481

Change-Id: Ibe012d2af48ff7062834eaacee93ca11221aba53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:32:47 +00:00
Kholoud Mohamed e21cf61eb6 Merge "Add missing enterprise string" into tm-dev am: b8e9cbcc65 am: 3a929f44ae am: 5892c61150
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230548

Change-Id: I0f1886803020c6d885800d26c5263b5a9a599f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:29:22 +00:00
James O'Leary ac7960cb3b Merge "Use T50 base instead of T95" into tm-dev am: 7ba0339b00 am: dc83690272 am: ec46ce46eb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167226

Change-Id: If88457147deb3f2de9e55b5658e8f7e711e64e10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:27:06 +00:00
Becky Qiu 03480471b4 Merge "Fix the IndexOutOfBoundsException in AllAppsGridAdapter." into tm-dev am: 05eac3ee27 am: 3229ecc69b am: bea7f71e8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206586

Change-Id: I94b801996cf33f8ec45549785c88f539bab7f9d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:27:00 +00:00
Sunny Goyal 0332fa434f Merge "Fixing wrong alpha for disbled icon" into tm-dev am: 8ca6e815bd am: 48bcc5f7a5 am: b461896e90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18237481

Change-Id: I67d02a44e1aa323303d80f238f8f9696ddd3a205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:26:33 +00:00
Kholoud Mohamed 6ae9ca59b5 Merge "Add missing enterprise string" into tm-dev am: b8e9cbcc65 am: 3a929f44ae am: b1bc2b5847
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230548

Change-Id: I49f73fd9e8d8f0b2013263d5ad315da9269793be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:26:13 +00:00
Sunny Goyal 39164d45cf Merge changes from topic "revert-17983445-hotseat_span-WQWWPUHOTD" into tm-dev am: b0416cc478 am: 3b88baeaac am: 409a8b7639
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236805

Change-Id: I6d016e7cde906469689c2643a0cc2ad0642e5bb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:25:10 +00:00
Sunny Goyal b65bb15817 Revert "Update workspace, cell layout, shortcut and widget, and cell size calculations." am: 3e8a04b341 am: d58c7e5d6b am: ef6ed6b68e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236355

Change-Id: I8a654e86af4b0816fb19e9c7d57eaf88003d3052
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:25:07 +00:00
Sunny Goyal d95ddeadd9 Merge changes from topic "revert-17983445-hotseat_span-WQWWPUHOTD" into tm-dev am: b0416cc478 am: 3b88baeaac am: 1a49fd4b0a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236805

Change-Id: I7114c82b3bfa382e1aba2647af76eef732cded62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:24:25 +00:00
Sunny Goyal 720a452999 Revert "Update workspace, cell layout, shortcut and widget, and cell size calculations." am: 3e8a04b341 am: d58c7e5d6b am: 12b035aeac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236355

Change-Id: I26da6018c6a530ed0f6e93c0d01f26a69c5dec8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:24:22 +00:00
Bill Yi 40e0c1dde6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cf58cdf4ed -s ours am: c2ff895e93 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4a6ebeef7a8affa2e17384a1011970c6d22ee8a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:10:56 +00:00
Bill Yi ce01beedb6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3536421d1d -s ours am: 5b6cc0b592 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9818543928fc9482d3b352a4dcc3301f430a3948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:10:44 +00:00
Sunny Goyal 1a419dd03e Merge "Adding feature to automatically show keyboard in all-apps" into tm-dev am: 7869000544 am: a0fbd4ddd4 am: 32457641f0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206142

Change-Id: I5c11c7ad2491b89389a8e5744d892d39904af75f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 22:09:22 +00:00
Bill Yi 7d7ee1031a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cf58cdf4ed -s ours am: d425957df9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie028dbdf674bcfbff54d9dc480ba9eb9b5d9c766
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:58:54 +00:00
Bill Yi f293c16d93 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3536421d1d -s ours am: a7e4ff2f02 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6e87a620263da3041ba0196a7a0c30557734ba7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:58:41 +00:00
James O'Leary ec46ce46eb Merge "Use T50 base instead of T95" into tm-dev am: 7ba0339b00 am: dc83690272
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167226

Change-Id: I19666288fc50f28d03d6d776d606a4223c1142a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:27:48 +00:00
Becky Qiu bea7f71e8f Merge "Fix the IndexOutOfBoundsException in AllAppsGridAdapter." into tm-dev am: 05eac3ee27 am: 3229ecc69b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206586

Change-Id: I910863d77baa38cd12aa7043234907abadcf7b1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:27:10 +00:00
Sunny Goyal b461896e90 Merge "Fixing wrong alpha for disbled icon" into tm-dev am: 8ca6e815bd am: 48bcc5f7a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18237481

Change-Id: If0d4c96b760ecc6008580f248324558466fd585b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:26:15 +00:00
James O'Leary 60e8fe2c0e Merge "Use T50 base instead of T95" into tm-dev am: 7ba0339b00 am: dc83690272
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167226

Change-Id: I7aefbe8128046fe6738d634452b892247d7afee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:25:54 +00:00
Kholoud Mohamed b1bc2b5847 Merge "Add missing enterprise string" into tm-dev am: b8e9cbcc65 am: 3a929f44ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230548

Change-Id: I8a3e7971f919dc4136ed5dbd8c6d6f6dde676bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:25:37 +00:00
Becky Qiu 71ae69b7c4 Merge "Fix the IndexOutOfBoundsException in AllAppsGridAdapter." into tm-dev am: 05eac3ee27 am: 3229ecc69b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206586

Change-Id: Ia7d55ecf668ece5d7587a6d0c67daf3419eea80f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:24:59 +00:00
Sunny Goyal 409a8b7639 Merge changes from topic "revert-17983445-hotseat_span-WQWWPUHOTD" into tm-dev am: b0416cc478 am: 3b88baeaac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236805

Change-Id: Ib849c2b924afed251380d25bc31ee05a45b34421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:24:44 +00:00
Sunny Goyal ef6ed6b68e Revert "Update workspace, cell layout, shortcut and widget, and cell size calculations." am: 3e8a04b341 am: d58c7e5d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236355

Change-Id: I8a6caf4ef78bb9d6e1399847d53f0a3927d75072
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:24:41 +00:00
Sunny Goyal c6564d06c0 Merge "Fixing wrong alpha for disbled icon" into tm-dev am: 8ca6e815bd am: 48bcc5f7a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18237481

Change-Id: I3de737387c29aaddf025aa68549db07afc8568ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:24:29 +00:00
Kholoud Mohamed 5892c61150 Merge "Add missing enterprise string" into tm-dev am: b8e9cbcc65 am: 3a929f44ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230548

Change-Id: Idcc2801f9866f4bf47f481923198c2c0f3f913b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:23:39 +00:00
Sunny Goyal 1a49fd4b0a Merge changes from topic "revert-17983445-hotseat_span-WQWWPUHOTD" into tm-dev am: b0416cc478 am: 3b88baeaac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236805

Change-Id: I45a169d608813eed5407108971f1ab34f63d2262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:23:30 +00:00
Sunny Goyal 12b035aeac Revert "Update workspace, cell layout, shortcut and widget, and cell size calculations." am: 3e8a04b341 am: d58c7e5d6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18236355

Change-Id: Iac35117ef4a30c7d9fb5ca7fa7b7fe11b3bf4890
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:23:27 +00:00
Bill Yi c2ff895e93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cf58cdf4ed -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ida3ffddbf847337c7edaf27fa1c4cb79cd61f7a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:22:56 +00:00
Bill Yi 5b6cc0b592 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3536421d1d -s ours
am skip reason: subject contains skip directive

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

Change-Id: If77dc96f74037848361342cb2bfd76ae6001221d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:22:43 +00:00
Bill Yi d425957df9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: cf58cdf4ed -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8c11e34d82b5b4b6d2b9c7d4ed14fc02211838ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:21:34 +00:00
Bill Yi a7e4ff2f02 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3536421d1d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaffe95c349a8551e850a18bd2406506c4cb256c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:21:22 +00:00
James O'Leary a61bfb6041 Merge "Use T50 base instead of T95" into tm-dev am: 7ba0339b00 am: 75d243c82e am: 0d6f0220f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167226

Change-Id: I176653b77762a171d8d95ccc846ced86acca52e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:08:48 +00:00
Becky Qiu a03350a532 Merge "Fix the IndexOutOfBoundsException in AllAppsGridAdapter." into tm-dev am: 05eac3ee27 am: 9a7aae69e1 am: b9f04a71e0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206586

Change-Id: Ic500c684e742cc2bdb7c6a0e5e10b416d98ef736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:08:41 +00:00
Sunny Goyal 6a50868a19 Merge "Fixing wrong alpha for disbled icon" into tm-dev am: 8ca6e815bd am: fc0e76ba64 am: b2f97a790c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18237481

Change-Id: Ie8032d783f01e7c8b0cfd216e1c662adbc91fe25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:08:35 +00:00
Kholoud Mohamed b9d4774e4b Merge "Add missing enterprise string" into tm-dev am: b8e9cbcc65 am: c208943a9e am: 3024c6a6ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18230548

Change-Id: I98bd2269678684a9b1695f64a2d3d6c76a0d6fcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:08:30 +00:00
James O'Leary 0d6f0220f6 Merge "Use T50 base instead of T95" into tm-dev am: 7ba0339b00 am: 75d243c82e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18167226

Change-Id: I496a9a54f9967cd37b9f6f7d78cc56854aaf0e25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:03:05 +00:00