Commit Graph

78507 Commits

Author SHA1 Message Date
Vinit Nayak 2c035792a8 [automerger skipped] Merge "Set camera icon as gray when app is unlaunchable" into 24D1-dev am: bddccbdc89 -s ours
am skip reason: Merged-In I64ae3db28293fa0adc249d700e9e03c074b6854f with SHA-1 a5e838d61c is already in history

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

Change-Id: I229c95f74b0999496464e600dc1bb37f97c1a15f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 03:40:22 +00:00
Jeremy Sim a587032262 [automerger skipped] Set camera icon as gray when app is unlaunchable am: 841e6c1e8e -s ours
am skip reason: Merged-In I64ae3db28293fa0adc249d700e9e03c074b6854f with SHA-1 a5e838d61c is already in history

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

Change-Id: I0ef7bb1236ecb1bdf86deb608c007ca7c8582ecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 03:40:19 +00:00
Vinit Nayak 32700f81ec Add placeholder divider view when starting split tasks
* This prevents launcher underneath from peaking through
while the split apps are loading

Bug: 299640096
Test: Launched from recents, home and all apps
Doesn't seem to affect small screen since recents scrolls
away and the scrim is only left

Change-Id: I32e394a0bc361489473ee657161c8f3bcbf1e422
(cherry picked from commit cdaabc6199)
Merged-In: I32e394a0bc361489473ee657161c8f3bcbf1e422
2024-04-12 03:24:46 +00:00
Vinit Nayak bddccbdc89 Merge "Set camera icon as gray when app is unlaunchable" into 24D1-dev 2024-04-12 03:20:36 +00:00
Shan Huang 05b6d1fb7e Generate progress events from app process for app animations.
Bug: 261654570
Flag: None
Test: atest BackNavigationControllerTest
Test: atest OnBackInvokedCallbackGestureTest
Test: atest BackAnimationControllerTest
Test: atest BackTouchTrackerTest
Test: atest WindowOnBackInvokedDispatcherTest

Change-Id: I075c099d59012825583fd9beda29a33d00f4d077
2024-04-11 19:16:01 -07:00
Saumya Prakash 42ecab5c11 [automerger skipped] Merge "Adjust where the back button is rendered for new SUW requirements." into 24D1-dev am: f44e8e5feb -s ours
am skip reason: Merged-In I22680f40c0ddf7cd03ab1da69406eb14184b0174 with SHA-1 da26e19dd8 is already in history

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

Change-Id: I7eb4365eaf0d8c6d48bfdecc39a66e1cb20d9a08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 00:34:06 +00:00
Saumya Prakash c95ace517f [automerger skipped] Adjust where the back button is rendered for new SUW requirements. am: afc6cfcd3b -s ours
am skip reason: Merged-In I22680f40c0ddf7cd03ab1da69406eb14184b0174 with SHA-1 da26e19dd8 is already in history

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

Change-Id: I448fd41512d6e9d52a485b50c6e2d36b3095edf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 00:34:04 +00:00
Jeremy Sim a57f60f989 [automerger skipped] Prevent menu items from showing on split tasks am: 1ece740e7a -s ours
am skip reason: Merged-In I121a9c28fa7570f10e13be2de6489182e3362cfc with SHA-1 6a60c3b113 is already in history

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

Change-Id: I889c68de8f915d564316b0a85e76c6bade736d2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 00:33:37 +00:00
Jeremy Sim 1a9783d318 [automerger skipped] Delete app pairs on model load if flag is turned off am: af645fe110 -s ours
am skip reason: Merged-In I4a97e4aadc620f8b727439fcdd70ab0e7a3005a8 with SHA-1 08fc2d434f is already in history

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

Change-Id: Ibb02a1398c72f84975459a203cf124b5b7ff82d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 00:33:34 +00:00
Jeremy Sim 54117ad6da [automerger skipped] Fix bug where app pair title was not updating with language am: ee1fdb4abc -s ours
am skip reason: Merged-In I833e4f9766b7da8c0a3a5fb4b9fc050d8897437e with SHA-1 24284467b5 is already in history

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

Change-Id: I590e7819ca2a374dac7e8f29df31a15cb03807e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-12 00:33:32 +00:00
Saumya Prakash f44e8e5feb Merge "Adjust where the back button is rendered for new SUW requirements." into 24D1-dev 2024-04-12 00:22:02 +00:00
Jeremy Sim 841e6c1e8e Set camera icon as gray when app is unlaunchable
This CL is a follow-up to ag/26825455. Now that we are changing app pairs' disabled appearance back to icon-only, the case where a camera icon should be grayed out on an app pair on a small screen needs to be reinstated.

Fixes: 333137187
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: I64ae3db28293fa0adc249d700e9e03c074b6854f
(cherry picked from commit a5e838d61c)
Merged-In: I64ae3db28293fa0adc249d700e9e03c074b6854f
2024-04-12 00:13:39 +00:00
Jeremy Sim f03dc2aed5 [automerger skipped] Fix launch flow when one app in an app pair is paused am: d2f256f179 -s ours
am skip reason: Merged-In Ieaf0120cced07b6ac0f3eb07c75b66666a8dcc85 with SHA-1 17db14b107 is already in history

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

Change-Id: Ib768f256eeecc92ae03898584b0562514f4f63bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 23:56:16 +00:00
Jeremy Sim db967cbb16 Update to correct Material SurfaceContainer values am: 588a4abf4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/26860034

Change-Id: Ic979ae7698953e7c550b378fd827bcdda06e5c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 23:56:14 +00:00
Jeremy Sim 381266e1f4 [automerger skipped] Update app pair icon colors when switching containers am: f49807538b -s ours
am skip reason: Merged-In I615cb95d51f7c4c120ad306246d9491bf4452229 with SHA-1 05617cb11f is already in history

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

Change-Id: I453f226c7b3411673a631378bc17780e9edfd41a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 23:56:11 +00:00
fbaron a7825a70e8 Page resets when scrolling slowly fix
Fix: 324071635
Flag: NONE
Test: Verified manually on RTL and non-RTL
Change-Id: Id778a0a01505d30bca4f216322f3ef3b951e63a7
(cherry picked from commit cae498032f)
2024-04-11 23:47:44 +00:00
Jeremy Sim 1ece740e7a Prevent menu items from showing on split tasks
This CL changes the TaskShortcutFactory for SCREENSHOT and MODAL so that the associated menu options ("Screenshot" and "Select") don't show up on split tasks. These actions are not fully supported on splitscreen tiles (they will only work on one of the two apps), so we disable them.

Bug: 327434215
Flag: N/A
Test: Manual
Change-Id: I121a9c28fa7570f10e13be2de6489182e3362cfc
(cherry picked from commit 6a60c3b113)
Merged-In: I121a9c28fa7570f10e13be2de6489182e3362cfc
2024-04-11 23:41:42 +00:00
Jeremy Sim af645fe110 Delete app pairs on model load if flag is turned off
This CL adds a case to processFolderOrAppPair() -- if the ENABLE_APP_PAIRS flag is turned off, we do not load app pairs into launcher.

This prevents a case where a user uses backup+restore to migrate an app pair onto an environment where app pairs is disabled.

Fixes: 330412376
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: I4a97e4aadc620f8b727439fcdd70ab0e7a3005a8
(cherry picked from commit 08fc2d434f)
Merged-In: I4a97e4aadc620f8b727439fcdd70ab0e7a3005a8
2024-04-11 23:39:10 +00:00
Jeremy Sim ee1fdb4abc Fix bug where app pair title was not updating with language
This CL adds the ability for an app pair icon to update its title string when package changes are detected. It also reorganizes some code in the app pairs classes for readability.

Fixes: 316051810
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: I833e4f9766b7da8c0a3a5fb4b9fc050d8897437e
(cherry picked from commit 24284467b5)
Merged-In: I833e4f9766b7da8c0a3a5fb4b9fc050d8897437e
2024-04-11 23:38:41 +00:00
Brandon Dayauon 5da04b231f Fix stale header height being used in scroll to header calculation
- This fixes the inconsistency of how far down is needed to scroll to since
the values used to calculate the header during drawOnScrimWithScaleAndBottomOffset() is faulty.
- Tweaked the row to scroll to when there are tabs vs no tabs. When there are no tabs, its possible the
header gets cut off most of the time hence subtracting by 1 will help this problem.

bug:332543940
Test locally: https://screenshot.googleplex.com/5y4vYiQcnSMKcA6
manual - before: https://drive.google.com/file/d/14Zj_FyO-3bVfXwuxaqgG_DXMELYS5bQn/view?usp=sharing
after with tabs:
after 5x5: https://drive.google.com/file/d/16rjaut6VqBMxG6uLQSnVTLRhUQnAANZ5/view?usp=sharing
after 4x5: https://drive.google.com/file/d/16jCPN8BewwuIQobt0t6tdVouUKpp1CdI/view?usp=sharing
after 4x4: https://drive.google.com/file/d/16VFQb5s6IfrpjRU9PmLlAJWjh1zIo77o/view?usp=sharing
after 3x3: https://drive.google.com/file/d/16VFQb5s6IfrpjRU9PmLlAJWjh1zIo77o/view?usp=sharing
after 2x2: https://drive.google.com/file/d/16N6Myuv9VtXgI1p4sIuV23iupea7jYLQ/view?usp=sharing

after no tabs:
after 5x5: https://drive.google.com/file/d/17H1oF_9fJnrtSqmJJqQyyn4upuM2CsoG/view?usp=sharing
after 4x5: https://drive.google.com/file/d/178Vu3SvnvSPODIfaR0oz6-jPVYDDNMaA/view?usp=sharing
after 4x4: https://drive.google.com/file/d/16yt_5ePPR7kwSrZlo5Sj3x0DqHoQKqYP/view?usp=sharing
after 3x3: https://drive.google.com/file/d/17HqebtHWcEHg-i9AfqHEVdl4YnQhX06P/view?usp=sharing
after 2x2: https://drive.google.com/file/d/17HqebtHWcEHg-i9AfqHEVdl4YnQhX06P/view?usp=sharing

after tablet:
landscape: https://drive.google.com/file/d/16JQGs0A3ifKpgqrpQwIzssrXbH-OC0Ej/view?usp=sharing
portrait: https://drive.google.com/file/d/16LmLnOEB6XkuAkAcgvP2mKHe5QQqG1oh/view?usp=sharing

Flag: ACONFIG com.android.launcher3.Flags.private_space_animation TRUNKFOOD

Change-Id: If8a70cc71e9cff4a7f8d3b648e3e59c414e40ee5
2024-04-11 16:22:11 -07:00
Android Build Coastguard Worker 413ac5523d Snap for 11704135 from 5bb103246b to 24Q3-release
Change-Id: I60df772f668ca5ae75d3731ab01510c6b4848ee4
2024-04-11 23:20:56 +00:00
Andy Wickham 22dee942b5 Cancel manual animation if LauncherState changes during drag.
Previously, the following would cause the All Apps panel to appear
in NORMAL state:

1. Start dragging to all apps
2. During the drag, something sets Launcher to NORMAL
3. Release finger  -> animation to all apps completes, but state
   is still NORMAL

Side effects of this:
 - On large screens, All Apps draws its background on Launcher's
   ScrimView only if the current state is All Apps. So in this
   case, the apps just floated above the workspace.
 - On handheld, touches are handled by workspace even though you
   can see the All Apps list. So e.g. if you swipe down, the
   notification shade appears rather than all apps panel hiding
   (although it seems this touch issue was addressed separately).

I'm not sure if this is the main/only case of this state mismatch
happening, but verified with local async state changes that this
could in theory happen. We haven't been able to organically repro
the bug reliably. That being said, it feels plausible that a well
timed screen lock during the all apps transition could also hit
this case.

Demo videos with hard-coded state change to NORMAL 2 seconds after
you start swiping up to all apps (note I release my finger at the
end of each video):
https://drive.google.com/drive/folders/1ul8ep9N2M5oc6ZSbf_ZHQwp9IwTpz7GB?resourcekey=0-4LAufl0rkvtjvgZC0L-eMQ&usp=drive_link

Bug: 239394946
Bug: 331600490
Test: Manual with local async launcher state changes
Flag: NA
Change-Id: I6364dbde8aea67f5d1c525edf57ed7eb26096cf9
2024-04-11 16:00:34 -07:00
Vadim Tryshev 2c72271915 Removing users synchronously
Bug: 302400996
Test: presubmit
Flag: N/A
Change-Id: Iac1863039cbb9d612abe416b7aee135eec25f223
2024-04-11 15:59:41 -07:00
Saumya Prakash 92b20d89a6 Fix incorrect fragment in gesture tutorial when rotating the screen
This change makes the current fragment load on configuration changes for
the gesture navigation tutorial. Previously, the old fragment would be recreated causing inconsistencies when rotating the screen. Not marking a flag as this change is for both the previous gesture tutorial and the current one.

Fix: 317162126
Test: Run the tutorial and rotate the screen after each step. The
tutorial should progress like normal.
Flag: N/A

Change-Id: I09c40006dd0ef6e9e78fa44e36962a678918420a
(cherry picked from commit c028cc7699)
2024-04-11 22:04:32 +00:00
Jeremy Sim 130be57171 Merge "Set camera icon as gray when app is unlaunchable" into main 2024-04-11 21:41:21 +00:00
Saumya Prakash afc6cfcd3b Adjust where the back button is rendered for new SUW requirements.
Large screen devices in landscape mode and devices that have mostly a
square aspect ratio are undergoing a redesign in Setup wizard that makes
most screens two-pane. As part of this redesign, the back button is
aligned in this change. This change doesn't use a flag because the Setup
Wizard change is not flagged.

Fixes: 323778778
Fixes: 328017929
Test: Run Setup Wizard and see if the back button aligns with the Skip
button in two pane screens.
Flag: N/A

Change-Id: I22680f40c0ddf7cd03ab1da69406eb14184b0174
Merged-In: I22680f40c0ddf7cd03ab1da69406eb14184b0174
2024-04-11 21:25:49 +00:00
Vinit Nayak 3983ad0350 [automerger skipped] Merge "Allow app pairs in folders" into 24D1-dev am: 559aeb2c45 -s ours
am skip reason: Merged-In I73732fcaefbdc61bf6e02a5be365962b8bbc3e41 with SHA-1 a596f589c4 is already in history

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

Change-Id: Iddd6c4d87cae874ddcc0450c3448334fbe12e323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 21:11:38 +00:00
Jeremy Sim af6aa2c034 [automerger skipped] Allow app pairs in folders am: 9109e43f02 -s ours
am skip reason: Merged-In I73732fcaefbdc61bf6e02a5be365962b8bbc3e41 with SHA-1 a596f589c4 is already in history

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

Change-Id: I7ca6356bad0272fc4f18c8c48a19f8ccfcab21f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 21:11:35 +00:00
Jeremy Sim d2f256f179 Fix launch flow when one app in an app pair is paused
This CL changes the error handling logic in ItemClickHandler to continue with app pair launch when only one app in an app pair is paused. It also changes AppPairIconGraphic so that the disabled state of the app pair is drawn modularly (if only one app is paused, only one app will appear visually paused).

Bug: 330795643
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: Ieaf0120cced07b6ac0f3eb07c75b66666a8dcc85
(cherry picked from commit 17db14b107)
Merged-In: Ieaf0120cced07b6ac0f3eb07c75b66666a8dcc85
2024-04-11 21:09:56 +00:00
Jeremy Sim 588a4abf4a Update to correct Material SurfaceContainer values
This CL fixes a bug where all surface_container color values (highest, high, surfaceContainer, low, lowest) were set to the same color value (the surfaceContainer value). Reference values taken from Android color token library at https://www.figma.com/file/o26ZXcRCR6gv0mEdl7Ix53/%5BAndroid-U%5D-Fog?type=design&node-id=4441-6849&mode=design&t=hXj4we7EkD8GWsD0-0

Bug: 315731527
Flag: none
Test: none
Change-Id: Ib6fa7739e6d644ea9a6e5cb388678a51926c7b71
(cherry picked from commit b35769003e)
2024-04-11 21:06:27 +00:00
Jeremy Sim f49807538b Update app pair icon colors when switching containers
This CL updates the color for the app pair background, and adds a way for an app pair icon to redraw as a different color when switching containers.

Bug: 315731527
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: I615cb95d51f7c4c120ad306246d9491bf4452229
(cherry picked from commit 05617cb11f)
Merged-In: I615cb95d51f7c4c120ad306246d9491bf4452229
2024-04-11 20:59:05 +00:00
Vinit Nayak 559aeb2c45 Merge "Allow app pairs in folders" into 24D1-dev 2024-04-11 20:55:33 +00:00
Andrew Cole 64dfdce2c1 Removing Shrink Adaptive Icons
This function is now obsolete and we can remove this and default to always shrinking non-adaptive (legacy) icons

Test: AllAppsSearchImageTest
Bug: 318867282
Flag: None
Change-Id: I1ba1566e362c55eb04871a7515fdc76fbc689d60
2024-04-11 20:28:10 +00:00
Vadim Tryshev a46a55ed05 Promote goToOverviewFromApp to presubmit
It's stable now:
https://android-build.corp.google.com/test_hub/search/?filter=&invfilter=unhealthyInvocations&invfilter=staleInvocations&tab=tests&query=branch%3agit_main%20target%3a%28cf_x86_64_phone-trunk_staging-userdebug%7ccf_x86_64_tablet-trunk_staging-userdebug%7ccf_x86_64_foldable-trunk_staging-userdebug%29%20config%3a%28v2%2fgnl-eng%2funbundled%2flauncher%2fnexus_unit_test_multi_device_platform%7cv2%2fgnl-eng%2funbundled%2flauncher%2fnexus_oop_test_multi_device_platform%7cv2%2fgnl-eng%2funbundled%2flauncher%2flauncher3_test_platform%29%20test%3a%22com.android.quickstep.FallbackRecentsTest%23goToOverviewFromApp%22

Bug: 187761685
Test: presubmit
Flag: N/A
Change-Id: I9c8777b976e2683aecdfa7f97950dee4c5661a11
2024-04-11 20:14:07 +00:00
Andreas Agvard 61d51f3c2b [automerger skipped] Merge "Removes recovery" into 24D1-dev am: 98e57de7a8 -s ours
am skip reason: Merged-In Icbebeade552cb101eb4b8bae4965b4d6c972f22e with SHA-1 6ce297a2ff is already in history

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

Change-Id: Ic742333dc8a69daec465c5e1ae37e0390e3edeca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 20:11:08 +00:00
Andreas Agvard f5c78364e6 [automerger skipped] Removes recovery am: c43b7163a2 -s ours
am skip reason: Merged-In Icbebeade552cb101eb4b8bae4965b4d6c972f22e with SHA-1 6ce297a2ff is already in history

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

Change-Id: Ib170642df4277ac6c5fa3f02bcd4d2dbb078a488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 20:11:04 +00:00
Andreas Agvard 98e57de7a8 Merge "Removes recovery" into 24D1-dev 2024-04-11 19:37:47 +00:00
Saumya Prakash 5bb103246b Merge "Adjust where the back button is rendered for new SUW requirements." into main 2024-04-11 19:05:52 +00:00
Jagrut Desai b625c2345a Remove PortraitLandscape from the TaplTestsTransientTaskbar
Test: Presubmit
Bug: 321083190
Flag: NONE
Change-Id: Ida1d902452280a9c161edbc63b1a0b9a4aad2e3f
2024-04-11 11:21:39 -07:00
Randy Pfohl c77a9ae116 Merge changes from topic "revert-26911513-revert-26414135-RecentsViewContainer-MEROZZOKJQ-WQFWDQZVKT" into main
* changes:
  Revert^2 "fixing tests to match new abstraction"
  Revert "Revert "abtracting Activity from recentsView through rec..."
2024-04-11 18:05:18 +00:00
Treehugger Robot d84b369960 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: f3313ac56a -s ours
am skip reason: contains skip directive

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

Change-Id: I782bb0ced3288eece93b4b46e32effb9c4f417e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:43:09 +00:00
Bill Yi 9361e8d8b9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b02a2a31f8 -s ours
am skip reason: contains skip directive

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

Change-Id: I20e658a01e4749e1f04ae9f22d6d93c5eaeeb5c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:43:04 +00:00
Treehugger Robot 2b1e5cb8f3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 2da34d8529 -s ours
am skip reason: contains skip directive

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

Change-Id: Ic4d790cde4448d56c89cd6149833ae97b7d02ad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:43:02 +00:00
Bill Yi 9d1c3a3457 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d6acf5c87c -s ours
am skip reason: contains skip directive

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

Change-Id: If85f17b414ffd09341ad897e7813cf8200b2b6dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:43:00 +00:00
Treehugger Robot 7d56237bce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 04d38ce5d2 -s ours
am skip reason: contains skip directive

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

Change-Id: Id652f80367bf2ef383bc006d680ee3d3ef5e9a5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:42:56 +00:00
Bill Yi 73b2ca4af6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ffdd0fe4cd -s ours
am skip reason: contains skip directive

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

Change-Id: Ib8c535a2b743badbb591f74b9f401c777c656a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-11 17:42:45 +00:00
Treehugger Robot f3313ac56a Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-11 17:26:52 +00:00
Treehugger Robot 2da34d8529 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-11 17:26:52 +00:00
Treehugger Robot 04d38ce5d2 Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev 2024-04-11 17:26:52 +00:00
Treehugger Robot 58a34cbb1d Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-11 17:25:57 +00:00