PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,729 Commits 1 Branch 0 Tags
94de34ce2fa5144833f7801e31c01e617b9a3de1
Commit Graph

76729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Schneider Victor-tulias e0600c6bca Handle onFlingFinished onRecentsAnimationStart 
If the onRecentsAnimationStart callback runs after the user lifts their finger and onFlingFinished runs, then onFlingFinished never has another chance to run, leaving the user trapped in a state where the launcher is not started and the AllSetActivity is still present but invisible. Reverted to allow onFlingFinished to run onRecentsAnimationStart to handle this edge case.

Flag: not needed
Fixes: 285194839
Test: Ran AllSetActivty with a delay in onRecentsAnimationStart
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1b2c2e694c6e233057570d3e8b4e5a0aa9c0c51a)
Merged-In: I33ce5c1d4955b34d4b77d3b740dc599621bd4ed1
Change-Id: I33ce5c1d4955b34d4b77d3b740dc599621bd4ed1
 2023-07-11 00:39:11 +00:00
Android Build Coastguard Worker b59e5f6f68 Snap for 10468395 from 10b5a3903a to udc-qpr1-release 
Change-Id: Ic805efaeed0577acf9d930eee0df0fe9dd59a55c
 2023-07-10 23:24:10 +00:00
Andrew Cole b234d8ec69 Merge "Removing screen record from test" into udc-qpr-dev am: 0b5cc64ec2 am: bbcb05a1b4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23923164

Change-Id: I3c4ae82d1d2c5a519b448177042812ae16c09195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 21:44:41 +00:00
Schneider Victor-tulias c057b5ab89 [automerger skipped] Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 am: ea547ecb4a -s ours am: a64b203a5d -s ours am: 38df243458 -s ours 
am skip reason: Merged-In I33ce5c1d4955b34d4b77d3b740dc599621bd4ed1 with SHA-1 ad2279a26e is already in history

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

Change-Id: I37a44bd5ca1bdd029e4ece5a30fe230c20eb95f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 21:43:22 +00:00
Schneider Victor-tulias 7c8601d315 [automerger skipped] Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 am: abf59f658c -s ours am: 4b82e8ec49 -s ours am: b7068832e3 -s ours 
am skip reason: Merged-In I33ce5c1d4955b34d4b77d3b740dc599621bd4ed1 with SHA-1 1b2c2e694c is already in history

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

Change-Id: I4b996e3e0b63468a5f81e3228cf740e47a25cc6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 21:42:10 +00:00
Schneider Victor-tulias e7ce5d3746 [automerger skipped] Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 am: ea547ecb4a am: 5a96798f21 -s ours am: 6c78885e7c -s ours 
am skip reason: Merged-In I33ce5c1d4955b34d4b77d3b740dc599621bd4ed1 with SHA-1 ad2279a26e is already in history

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

Change-Id: I9f7abf315f42d199fdbcd136d70632b695eaa48c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 21:41:41 +00:00
Andrew Cole bbcb05a1b4 Merge "Removing screen record from test" into udc-qpr-dev am: 0b5cc64ec2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23923164

Change-Id: I8574a87c8794984cd026cdc155812f94f1bda9e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 20:38:54 +00:00
Schneider Victor-tulias 38df243458 [automerger skipped] Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 am: ea547ecb4a -s ours am: a64b203a5d -s ours 
am skip reason: Merged-In I33ce5c1d4955b34d4b77d3b740dc599621bd4ed1 with SHA-1 ad2279a26e is already in history

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

Change-Id: I648d17fc82f6229852c4e331efee5b729bedeef4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 20:38:43 +00:00
Mady Mellor 4e0ec1e458 Unify calls to sysuiProxy#showBubble into one method 
This will make it easier to note that a bubble has been "visited"
so that we can hide the update dot (coming in future CL).

Test: manual
Bug: 269670235
Change-Id: Ie2dbbc478198ece65c05927295d3c3031a7be82e
 2023-07-10 13:38:15 -07:00
Schneider Victor-tulias b7068832e3 [automerger skipped] Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 am: abf59f658c -s ours am: 4b82e8ec49 -s ours 
am skip reason: Merged-In I33ce5c1d4955b34d4b77d3b740dc599621bd4ed1 with SHA-1 1b2c2e694c is already in history

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

Change-Id: Ie7504c4c85f8db2ff0a2dbfb63b14222f1ce1917
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 20:35:43 +00:00
Schneider Victor-tulias 6c78885e7c [automerger skipped] Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 am: ea547ecb4a am: 5a96798f21 -s ours 
am skip reason: Merged-In I33ce5c1d4955b34d4b77d3b740dc599621bd4ed1 with SHA-1 ad2279a26e is already in history

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

Change-Id: I7890ded66910eb422b99beca3f69e3d371226064
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 20:35:04 +00:00
Sebastian Franco 7ba948967c Adding flag for use of ParametrizeReorderAlgorithm 
Also, some cleaning of the comments.

Bug: 289420844
Test: compiling
Change-Id: I5dfb4b252755550059c3ee050bc491f5449bec97
 2023-07-10 20:32:18 +00:00
Andrew Cole 0b5cc64ec2 Merge "Removing screen record from test" into udc-qpr-dev 2023-07-10 20:00:55 +00:00
Schneider Victor-tulias 3768529062 [automerger skipped] Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 am: 6a86a11ade -s ours 
am skip reason: Merged-In I33ce5c1d4955b34d4b77d3b740dc599621bd4ed1 with SHA-1 ad2279a26e is already in history

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

Change-Id: If5a1eeabeb3d56fa5d88b7269274d1bee2d93018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:52:29 +00:00
Schneider Victor-tulias a64b203a5d [automerger skipped] Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 am: ea547ecb4a -s ours 
am skip reason: Merged-In I33ce5c1d4955b34d4b77d3b740dc599621bd4ed1 with SHA-1 ad2279a26e is already in history

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

Change-Id: I549d82879e920c2c24a3eb3bb0e586634a392933
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:52:11 +00:00
Schneider Victor-tulias 4b82e8ec49 [automerger skipped] Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 am: abf59f658c -s ours 
am skip reason: Merged-In I33ce5c1d4955b34d4b77d3b740dc599621bd4ed1 with SHA-1 1b2c2e694c is already in history

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

Change-Id: Idfa75aebe42f19966639aed8efc9178fb3df057a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:51:56 +00:00
Schneider Victor-tulias 5a96798f21 Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 am: ea547ecb4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23796565

Change-Id: I50091bfa0af884e3990c939af5e576fcab511bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:49:36 +00:00
Schneider Victor-tulias abf59f658c Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23796565

Change-Id: I65672b6fdd803cd1f7d6ed069b3a254a2c85b8c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:08:49 +00:00
Schneider Victor-tulias 6a86a11ade Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23796565

Change-Id: I93f964f879cf8de5148b256770991d102c86a22d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:08:36 +00:00
Schneider Victor-tulias ea547ecb4a Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev am: 3d1e78a496 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23796565

Change-Id: I9ecbc2efa905f1dd545a2b735fb020b378e5fd76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 19:08:35 +00:00
Schneider Victor-tulias 3d1e78a496 Merge "Handle onFlingFinished onRecentsAnimationStart" into udc-dev 2023-07-10 18:33:25 +00:00
Vinit Nayak f6c2e87747 Dismiss split select when tapping on home button 
Bug: 276361926
Test: Initate split, dismiss whenever home is pressed,
doesn't dismiss when all apps dragged down
Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE

Change-Id: Idc95123e27963c3913d04c6eb27f0e4c9b1eb401
 2023-07-10 11:06:42 -07:00
Tracy Zhou 13ca2d1263 Merge "Fix icon not showing in staged split from keyboard shortcut" into udc-qpr-dev am: 10b5a3903a am: 35fd1517bc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23996760

Change-Id: Ia14fe62163dc5021c0449df591d21d3d2a91242e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 18:06:19 +00:00
Andy Wickham f08f77d496 Merge "Use DECELERATED_EASE for workspace scale for all apps on tablet." into udc-qpr-dev am: fd924b479e am: 68ba98352b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23988033

Change-Id: I9571a829106df50deacc1feb5b22e893340dd424
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 18:05:31 +00:00
Treehugger Robot b7d6efd677 Merge "Fix pageindicator for RTL mode" into udc-qpr-dev am: b6a32d1340 am: 1033f5d559 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23860742

Change-Id: Ia5b4ddb37dc6b5c52a520926419acc28f78e42e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 18:03:16 +00:00
Tracy Zhou 35fd1517bc Merge "Fix icon not showing in staged split from keyboard shortcut" into udc-qpr-dev am: 10b5a3903a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23996760

Change-Id: Iceb6e903bd2c83a87b8ebe5289ed4fbfcb324fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 17:48:09 +00:00
Tracy Zhou 10b5a3903a Merge "Fix icon not showing in staged split from keyboard shortcut" into udc-qpr-dev 2023-07-10 17:31:55 +00:00
Andy Wickham 68ba98352b Merge "Use DECELERATED_EASE for workspace scale for all apps on tablet." into udc-qpr-dev am: fd924b479e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23988033

Change-Id: I532b9eeaf3a4492b5ba9579dec286c20f47244bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 17:28:46 +00:00
Treehugger Robot 1033f5d559 Merge "Fix pageindicator for RTL mode" into udc-qpr-dev am: b6a32d1340 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23860742

Change-Id: Id196f3c79a134e08cb17f7ec67384f493c0dace2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 17:28:20 +00:00
Andy Wickham fd924b479e Merge "Use DECELERATED_EASE for workspace scale for all apps on tablet." into udc-qpr-dev 2023-07-10 17:05:11 +00:00
Sunny Goyal 2cf183d14c Adding some utility test rules 
> LasyActivityRule to be used by ActivityScenario
> Utility rule to easily override feature flags

Bug: 284202543
Test: Presubmit
flag: N/A
Change-Id: I95ae19bfb1d67a55941e7b8e5c47516a351b0d24
 2023-07-10 10:02:44 -07:00
Liran Binyamin a38a5c193e Merge "Pass the bubble bar screen coordinates to WMShell" into udc-qpr-dev am: 57d68b4834 am: 6964b6633b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23984264

Change-Id: I01904e826cf28953a7b431d73bf9226891899fa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 16:51:50 +00:00
Treehugger Robot b6a32d1340 Merge "Fix pageindicator for RTL mode" into udc-qpr-dev 2023-07-10 16:48:33 +00:00
Liran Binyamin 6964b6633b Merge "Pass the bubble bar screen coordinates to WMShell" into udc-qpr-dev am: 57d68b4834 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23984264

Change-Id: I34a294754edc7c9b8c90a7efb1193b6f29117146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 16:23:53 +00:00
Charlie Anderson b6941f1f52 Merge "Fixes home screen popup animation by removing unnecessary animation from ArrowPopup" into udc-qpr-dev am: 58013497d0 am: 34ec88ac1c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23900936

Change-Id: I9b8908b65097f8e76fe7ece54c29addb13a71002
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 15:51:07 +00:00
Liran Binyamin 57d68b4834 Merge "Pass the bubble bar screen coordinates to WMShell" into udc-qpr-dev 2023-07-10 15:44:35 +00:00
Charlie Anderson 34ec88ac1c Merge "Fixes home screen popup animation by removing unnecessary animation from ArrowPopup" into udc-qpr-dev am: 58013497d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23900936

Change-Id: Ieb3a31d08686a3feed3d99dc0239245910598526
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-10 15:20:51 +00:00
Charlie Anderson 58013497d0 Merge "Fixes home screen popup animation by removing unnecessary animation from ArrowPopup" into udc-qpr-dev 2023-07-10 14:39:19 +00:00
Thales Lima 4cfd9509e6 Fix responsive folders 
Fix: 284155638
Test: DeviceProfileResponsiveDumpTest
Flag: ENABLE_RESPONSIVE_WORKSPACE
Change-Id: I462b696747343b154c1c39c0dc2075022623194e
 2023-07-10 14:01:28 +01:00
Android Build Coastguard Worker ba3ae8d5fb Merge cherrypicks of ['googleplex-android-review.googlesource.com/23909000', 'googleplex-android-review.googlesource.com/23923806', 'googleplex-android-review.googlesource.com/23920481'] into udc-release. 
Change-Id: I8ff9da2a0d21330d22a61bd9d4a566854f935d4a
 2023-07-09 10:04:15 +00:00
Andrew Cole fb8a789fc9 Updating materialColorSurfaceContainerHighest color access 
For any view files applying the WidgetConatinerTheme via widgetsTheme they were incorrectly inheriting themes and skipping the AppTheme provided but only in light mode. In dark mode the WidgetContainerTheme.Dark was correctly inheriting the theme.

To avoid a risky theme update for all widgetsThemes we just modify the color accessor to use @color instead of ?attr as these colors should not be attributes AFAIKT

Bug: b/289305591
Test: Follow repro steps on the bug for smartspace
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a9af3bd03db3c19a07a4015471ee5c83d364fd36)
Merged-In: I26cc3239763f8eac3dfe5f094c6757692f46d1bc
Change-Id: I26cc3239763f8eac3dfe5f094c6757692f46d1bc
 2023-07-09 10:03:35 +00:00
Winson Chung 1672e8a367 Fix an issue with nav bar translations not being updated 
- There are flows where the shared taskbar state is updated prior
  to being destroyed, and not updated to the latest values when
  the taskbar is recreated.

  ie.
    unfolded -> lock screen -> LauncherTaskbarUiController's
      mTaskbarInAppDisplayProgress[SYSUI_SURFACE_PROGRESS_INDEX]
      is set to 1 due to the notif shade (lockscreen) showing.
      This is written into TaskbarSharedState's sysuiStateFlags
      and inAppDisplayProgressMultiPropValues.
    fold -> TaskbarActivityContext is destroyed
    unlock -> TaskbarManager and TaskbarSharedState's
      sysuiStateFlags are updated while the device is folded
    unfold -> TaskbarActivityContext is recreated and initialized
      which restores from the shared state's
      inAppDisplayProgressMultiPropValues. It also tries to reapply
      the shared state's sysuiStateFlags, but this doesn't update
      inAppDisplayProgressMultiPropValues because the state's
      "enabled" state is not updated (default is no flag set, and
      lockscreen sysui state is not set anymore).
    -> The restored inAppDisplayProgressMultiPropValues value
       results in the wrong translation.

- Note that after the above, the NavbarButtonsViewController state
  is actually correct and reflects the SysUI state, but the
  LauncherTaskbarUiController state is wrong.  This CL tries to
  manually update the ui controller to the correct state when it
  is recreated.
- CL also fixes a separate issue where LauncherTaskbarUIController
  could potentially overwrite the saved state progresses while
  restoring them due to the state callback being called

Bug: 283346744
Test: Unfold -> Lockscreen -> Fold -> Unlock -> Unfold and ensure
      the buttons are translated correctly



Signed-off-by: Winson Chung <winsonc@google.com>
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ccd359d76c7f42d4fc799f19d54a66c7c2fa462a)
Merged-In: I43e473faf4fa2a493b9705506e3755df8f6264e7
Change-Id: I43e473faf4fa2a493b9705506e3755df8f6264e7
 2023-07-09 10:03:30 +00:00
Winson Chung 1f6a5f50e5 Ignore recents transition if there are no closing tasks 
- In the case where Launcher calls startRecentsTransition while there
  are no other visible tasks, we should not be continuing with the
  transition as there are no tasks for Launcher to control.  This was
  previously handled in RecentsAnimationController in legacy
  transitions, but the safer fix is to ignore it on the Launcher
  side for this release.

Bug: 289175232
Test: Manually trigger empty targets and verify no issues
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:6f7e15ff644bac2f11ecb779030255efebc18885)
Merged-In: I3657c000cbc8c14c9ac989c2a57715515c96edb6
Change-Id: I3657c000cbc8c14c9ac989c2a57715515c96edb6
 2023-07-09 10:03:24 +00:00
Android Build Coastguard Worker 695543a7de Snap for 10462136 from f98dc0c5a5 to udc-qpr1-release 
Change-Id: I56ea2985995d396fc7a0189c3e6a821e4c826c49
 2023-07-08 23:18:54 +00:00
Tracy Zhou da6a625f46 Fix icon not showing in staged split from keyboard shortcut 
Bug: 246661484
Test: https://screenshot.googleplex.com/8X6ggCoYPD8rzSp
Change-Id: I0fa592b1a027769fd09a6de803ea44f5ae915f43
 2023-07-08 13:59:12 -07:00
Bill Yi 5e259137fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6dbeb857dd -s ours am: c7aea24632 -s ours am: 4e0439e0f9 -s ours am: 85d39517e4 -s ours am: d35fecb338 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ieb21d1cd70f2290e5563915fded054330f100ac2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:57:12 +00:00
Bill Yi 8893bd641f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6dbeb857dd -s ours am: 23cab2aefe -s ours am: af1f24fd26 -s ours am: 8d96c9b001 -s ours am: 7fb2b839b4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I25cdb0c25be4d63df6b0bca99f6542b1ebcd09e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:55:37 +00:00
Bill Yi 37cde55486 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 74b56cdf68 -s ours am: b2f9d0a35e -s ours am: d352fbecc3 -s ours am: 6490d3d5be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If88c54664c66311a6079ff9df412267a3458e3d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:52:35 +00:00
Bill Yi fa0c8f9595 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2ad619c22 -s ours am: abf969db2c -s ours am: 3effc59509 -s ours am: e30e9ffaa0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib6c769679d631914dfac0c58cf546abfc6461733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:52:25 +00:00
Bill Yi 94ab037de0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 039df45c67 -s ours am: d9b7b6ddd9 -s ours am: e51f376361 -s ours am: c7071bd1e9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id104c809aa418760eb3fa99f63ed52854dcb913c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:52:13 +00:00