PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions 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
Tracy Zhou 7183e4b460 Merge "Add originalView of the menu to SystemShortcut" into tm-dev 2022-04-26 17:28:40 +00:00
Shan Huang 3e952539a1 Fix screen rounded corner flicker. 
We've previously always played transitions with a fixed start corner
radius. This should however be an interpolated value based on gesture
progress.

Bug: 230115505
Test: Turn on predictive animations. Try completing a back swipe as well
as canceling a back swipe. Observe corner radius to make sure there's no
flicker.

Change-Id: Iae2517d969ed1b779bced866407b939b3a011b68
 2022-04-26 17:16:22 +00:00
Automerger Merge Worker 9682f66b62 Merge "Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 am: ac74647c44" into tm-d1-dev-plus-aosp am: 7a73b3d90d am: 590e3c51e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: Ie6f741ce163cbcf82f38e0025c4cecfedc394285
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 16:56:53 +00:00
TreeHugger Robot acbf855c60 Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 am: 14615df286 am: 7b12c22f23 am: b747b43a8d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: Iaceb0eae97fe37a780fa28805ce386b5a1f2407f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 16:56:26 +00:00
TreeHugger Robot 145b837ced Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 am: 14615df286 am: 16a13ec3e6 am: e58c73ffea 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: I5522f735f209ae2a60ffead535737c8064ddd919
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 16:55:19 +00:00
Automerger Merge Worker 590e3c51e6 Merge "Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 am: ac74647c44" into tm-d1-dev-plus-aosp am: 7a73b3d90d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: Ibe9d365e1f7eac45903321e28fd5128f6663e34b
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 16:33:44 +00:00
TreeHugger Robot b747b43a8d Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 am: 14615df286 am: 7b12c22f23 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: I5e258610758e38ed6fb7fea2ad4a45f541c5594c
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 16:33:03 +00:00
TreeHugger Robot e58c73ffea Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 am: 14615df286 am: 16a13ec3e6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: I78b6b7d97fab1810140b2bc09f585566feb47c2a
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 16:32:31 +00:00
Automerger Merge Worker 7a73b3d90d Merge "Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 am: ac74647c44" into tm-d1-dev-plus-aosp 2022-04-26 16:11:53 +00:00
TreeHugger Robot 728833bcc6 Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 am: ac74647c44 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: I8b66ee296f97a83419b6fac92f9667ad8827dbb2
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 16:11:41 +00:00
TreeHugger Robot 7b12c22f23 Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 am: 14615df286 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: I35f34445f7ff733f9e1e43ec5972f1d6bd4d477d
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 16:11:40 +00:00
TreeHugger Robot 16a13ec3e6 Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 am: 14615df286 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: I10c86da47d157bb99d3422719f2f9c8acf8fc568
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 16:11:39 +00:00
TreeHugger Robot cea10a4fb4 Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 am: eb4fa04985 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: I76d64e3b7cd443423b3bbe291e82717c4f4d2ffa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 16:11:14 +00:00
TreeHugger Robot 14615df286 Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: I86545cb56dac22db803cacfdc893f82efcecefd5
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 15:36:46 +00:00
TreeHugger Robot eb4fa04985 Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: Ibdf49c7fd6e0f485445c3e4cbfd9abbb214a6539
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 15:35:50 +00:00
TreeHugger Robot ac74647c44 Merge "Refactors Search results into separate RV for Toast." into tm-dev am: 0a6e9b4751 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17699868

Change-Id: I01d42422cdf61aa9f8d8f46639e4dd2eaaa7afa9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-26 15:35:37 +00:00
Andras Kloczl 0056e95d8e Change home dragging logic for dead zones 
- If a dragged item is not over a valid drop target
then we don't highlight anything and on drop we move
it back to its original position.
- Instead of checking if the dragged item is over the
hotseat view, now we check if the item is over the hotseat
shortcuts.
- Smartspace is a dead zone

Test: drag items from different workspaces, allapps, widget
  picker etc. to all parts of the screen and verify which
  view is targeted and where the item gets dropped.
  Check on phone/foldable/tablet.
Bug: 228201267
Change-Id: I18de576ea300d58ae645e511b238e0b946b5595a
 2022-04-26 16:28:11 +01:00
TreeHugger Robot 0a6e9b4751 Merge "Refactors Search results into separate RV for Toast." into tm-dev 2022-04-26 15:06:49 +00:00
Android Build Coastguard Worker cd7aff7179 Snap for 8499686 from 5dbeee28f5 to tm-qpr1-release 
Change-Id: I8311abb2637a1771bee77edda992fc49595c9316
 2022-04-26 03:18:24 +00:00
Android Build Coastguard Worker 5a61e2858a Snap for 8498890 from 833b0a0b5b to tm-release 
Change-Id: Ifc0d5d691b80387c1e49288c3d9c52921caff62a
 2022-04-26 01:20:03 +00:00
Pablo Gamito 206bdb292f Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 am: 7976d46fc2 am: 15ae3ac2b5 am: 32076544c5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: I57d73414a4a2de36f477bec2a1e01ca985295ce4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:52:41 +00:00
Pablo Gamito d188598551 Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 am: 4a8d162888 am: 01d9bebd30 am: aca877e0f7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: I2055a9f3ab077e337efec58c7efada831e2c9d33
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:52:31 +00:00
Pablo Gamito b3d3c1b10f Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 am: 4a8d162888 am: 5dbeee28f5 am: 51d9f72d52 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: Ic5b5f1b6ce91a15ab0b902204c97c3a9fb6bd279
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:50:10 +00:00
Pablo Gamito 32076544c5 Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 am: 7976d46fc2 am: 15ae3ac2b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: Ifc6b67fc6ee20693b06a810fd11705fd78a2a8d9
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:31:08 +00:00
Pablo Gamito aca877e0f7 Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 am: 4a8d162888 am: 01d9bebd30 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: I43fdc5a282ec80fd46fd025054c28523595a39ff
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:30:37 +00:00
Pablo Gamito 51d9f72d52 Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 am: 4a8d162888 am: 5dbeee28f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: I6071292103aeff3ce86c1fb7c2b6dd05f2b95b91
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:30:30 +00:00
Schneider Victor-tulias a9b2c4bb5a Revert "Remove old logs associated to b/200572078" 
This reverts commit c4240fd429.

Reason for revert: Returning logs for flaking test

Bug: 227650070
Change-Id: I7db31533cfb72d9e329f38dc001f3a8e52b9fb7f
 2022-04-25 22:23:20 +00:00
Pablo Gamito 15ae3ac2b5 Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 am: 7976d46fc2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: I85e2cc55bc39d21ba0ffebe7dc869c459f787b16
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:09:06 +00:00
Pablo Gamito 01d9bebd30 Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 am: 4a8d162888 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: Ie58afb934f87956f336e3437e8c5f319ce4a7954
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:08:51 +00:00
Pablo Gamito 5dbeee28f5 Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 am: 4a8d162888 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: I96eac233e4eea68782a849f81bbae657672d7805
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:08:47 +00:00
Pablo Gamito a1763485c7 Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 am: 2dcd118a14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: Iaa6b649c813b79c37432688f83aeae61e816ead0
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 22:08:18 +00:00
Schneider Victor-tulias 9c1a452a1d Translate the 3 navigation buttons to/from their in-app position when animating to/from the -1 screen, all apps and widgets. 
Bug: 221455508
Test: opened all apps, widgets, -1 screen, notifications shade and keyboard in various combinations and orders; locked screen, launched app, returned home with the back/home buttons, opened overview
Change-Id: Ia0b406aacf72b34bd6b7ff1c01278ab6895a7da4
 2022-04-25 14:57:13 -07:00
Pablo Gamito 4a8d162888 Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: I8c53fb1f523bab006a4a70870c81d9e47995804f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 21:44:14 +00:00
Pablo Gamito 7976d46fc2 Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: I049cb742067d12a36d9ea22742f9a7791e3cf279
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 21:42:59 +00:00
Pablo Gamito 2dcd118a14 Merge "Use shared background color animation for settings activity" into tm-dev am: 7379074007 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17875203

Change-Id: I2dabd8bb18bc6e94f8480fc258417a9499a1fa46
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 21:42:55 +00:00
Pablo Gamito 7379074007 Merge "Use shared background color animation for settings activity" into tm-dev 2022-04-25 21:22:21 +00:00
Schneider Victor-tulias 8aa99c72b1 Fix taskbar 3-button truncation on rotate 
- Fixed truncation issue in overview and home on rotation
- Fixed 3 buttons translating incorrectly when switching to/from overview

Fixes: 205057824
Fixes: 215482458
Test: Manual
Change-Id: I0b89010a2b6ed03a34c3443fc6e1edc81f8d9f20
 2022-04-25 13:40:57 -07:00
Vinit Nayak 2d1a69e58b Revert "Revert "Use new onStartSplitLegacy when starting split f..." 
Revert submission 17918609-revert-17779173-startSplitLegacy-OOWPZEFFGI

Reason for revert: Running through TH
Reverted Changes:
I6d81e0584:Revert "Use new onStartSplitLegacy when starting s...
I754bc308f:Revert "Remove check for preventing re-parenting n...

Change-Id: I6eea82f34b3680020b49ec7fe19eb61cc68286a5
 2022-04-25 19:55:31 +00:00
Alex Chau a2fc764405 Update overview actions alignment 
- Align overview actions to the top with a defined margin below task thumbnail, except for vertical bar layout
- In modal state, use task view's bottom as pivot, and expand using all the space about pivot
- Simplified overview actions margin calculation and moved some logic to DeviceProfile

Bug: 209981696
Test: manual on various devices
Change-Id: I4c96cb02c6f3d6adf30633ddeb883bc4eec16f36
 2022-04-25 19:20:21 +01:00
Pat Manning a2e1499a2f Move spring loaded scale calculation to DeviceProfile. 
Fix: 229838395
Test: manual
Change-Id: I6dbbc850e88aaacceb1363e342404b06104f8c10
 2022-04-25 18:58:09 +01:00
Thales Lima 25ac8b804f Increase empty space limits 
Bug: 227344807
Test: manual
Change-Id: Id5d484d57da60f3cf90db9bf0571919d93288de3
 2022-04-25 18:49:33 +01:00
Sebastian Franco 00aff95ac0 Give the tests the ability to emulate other devices screens 
This code contains utility clases that can change the display
of a device and make it look like another device.
The function DisplayEmulator#emulate receives a DeviceEmulationData
a certain grid to emulate and a callback, everyting that happens
inside of the callback will happen when the device is being emulated
and can be used by other tests.

Example test:
package com.android.launcher3.deviceemulator;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.filters.MediumTest;
import com.android.launcher3.deviceemulator.models.DeviceEmulationData;
import com.android.launcher3.ui.AbstractLauncherUiTest;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.util.concurrent.TimeUnit;

@MediumTest
@RunWith(AndroidJUnit4.class)
public class TestTest extends AbstractLauncherUiTest {
    @Test
    public void testEmulation() throws Exception {
        String deviceCode = "pixel6pro";
        DeviceEmulationData deviceData = DeviceEmulationData.getDevice(deviceCode);
        String grid = "normal";
        DisplayEmulator displayEmulator = new DisplayEmulator(mTargetContext);

        displayEmulator.emulate(deviceData, grid, () ->{
            TimeUnit.SECONDS.sleep(10);
            return true;
        });
    }
}

Test: You could use the test above to make your device look like a
Pixel6 pro for 10 secons.
Fix: 229028257

Change-Id: Icd79be405a2e14dda0bc5f555b0e46149e16f912
 2022-04-25 11:57:58 -05:00
Jerry Chang c3865b86e4 Fix divider bar won't fade-in as the other splitting tasks 
Bug: 226271407
Test: manual check the divider bar fade-in animation after launchTasks
Change-Id: I5ea7c6ea5ac3f3550b28e9c0f854e70edcfc97b0
 2022-04-25 15:41:28 +00:00
Bill Yi ce4c5ca3ea Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9e85d1617f400b19effa891f03a9c27b7f2194a2
 2022-04-25 02:45:03 +00:00
Bill Yi 5f02b2d52c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibf24622e458e5b2029a3cb0486f51cefa16372d2
 2022-04-25 02:43:37 +00:00
Automerger Merge Worker bc4452a555 Merge "Merge "Adds Search Onboarding count and renames existing edu pref." into tm-dev am: 833b0a0b5b am: 73dfd548ca" into tm-d1-dev-plus-aosp am: 2fd5aaab5e am: 47aae4e096 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17876281

Change-Id: If8b7d128792fa861edec2373628c648f390faad4
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 01:59:29 +00:00
Andy Wickham 3e1b5ac1ad Merge "Adds Search Onboarding count and renames existing edu pref." into tm-dev am: 833b0a0b5b am: 94a202c4a8 am: 7a0fa3182c am: cc4e171636 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17876281

Change-Id: Ifbc4164f1d18511b016c1b2b2a7714dadf175f00
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 01:59:16 +00:00
Andy Wickham b56322d81e Merge "Adds Search Onboarding count and renames existing edu pref." into tm-dev am: 833b0a0b5b am: 73dfd548ca am: 6524d7315b am: 9bface7b68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17876281

Change-Id: Ibe59d393807031c35d36c9d33488ea37ff411913
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 01:59:01 +00:00
Automerger Merge Worker 47aae4e096 Merge "Merge "Adds Search Onboarding count and renames existing edu pref." into tm-dev am: 833b0a0b5b am: 73dfd548ca" into tm-d1-dev-plus-aosp am: 2fd5aaab5e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17876281

Change-Id: I32427459038a47d112c299207b5d117c98f2cfed
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 01:36:05 +00:00
Andy Wickham cc4e171636 Merge "Adds Search Onboarding count and renames existing edu pref." into tm-dev am: 833b0a0b5b am: 94a202c4a8 am: 7a0fa3182c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/17876281

Change-Id: I92fe03d375cc8d7888fa1b500da544e049c1e3d3
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-25 01:35:46 +00:00