Commit Graph

53916 Commits

Author SHA1 Message Date
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
Becky Qiu b9f04a71e0 Merge "Fix the IndexOutOfBoundsException in AllAppsGridAdapter." into tm-dev am: 05eac3ee27 am: 9a7aae69e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18206586

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

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

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

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

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

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

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

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

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

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

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

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

Change-Id: I6f8adc4e915cf9fcfb434ec8c3f297bb5f938de6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 20:22:06 +00:00
James O'Leary 7ba0339b00 Merge "Use T50 base instead of T95" into tm-dev 2022-05-10 19:52:47 +00:00