PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,507 Commits 1 Branch 0 Tags
eedc7ab8fdb94de05201fa87537991558accbe8a
Commit Graph

78507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bill Yi 8b3e5d9fc8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 14d76c5fe6 -s ours am: 8da1a58e6a -s ours am: 0c50e8571d -s ours am: 1cf7358646 -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: I895aae9766c35b25ac0c1f9b2099a80834aff0b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:51:59 +00:00
Bill Yi 1f4d88b3c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6dbeb857dd -s ours am: 23cab2aefe -s ours am: b708191740 -s ours am: f98dc0c5a5 -s ours am: 455c1bf79c -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: I2f7f70a3575ee952fc54093e427ec631a209f8f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:49:49 +00:00
Automerger Merge Worker e35cc186b3 Merge changes from topic "am-352985f888d641f78c6c89f939d5bd5b" into udc-qpr-dev-plus-aosp am: 86157ec18d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23971855

Change-Id: I6e684d3752503ddf428eb6387c74a2475eb71d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:48:24 +00:00
Bill Yi 2049681097 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 74b56cdf68 -s ours am: aec7e63142 -s ours am: ad56d714e9 -s ours am: cdec8cd0f4 -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: I6b6961dca11efd248812d5c7b20cb1e5f1033006
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:48:10 +00:00
Bill Yi 82f50e2227 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6dbeb857dd -s ours am: 23cab2aefe -s ours am: b708191740 -s ours am: a9e74cfc4d -s ours am: 140a24f793 -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: I3b252731717c29db62cefd77d550e7f2cc530fb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:41:52 +00:00
Bill Yi d35fecb338 [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 skip reason: subject contains skip directive

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

Change-Id: Ib0455b28bcb9209f11c036e768ca38c6834be2d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:41:46 +00:00
Bill Yi 7fb2b839b4 [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 skip reason: subject contains skip directive

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

Change-Id: Id5928e0b4c8de2877e888f0400dda0f4aa441574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:40:14 +00:00
Bill Yi 6490d3d5be [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 skip reason: subject contains skip directive

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

Change-Id: Id9045ecae773f81fe7d9ba56bceb2811b9591488
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:23 +00:00
Bill Yi e30e9ffaa0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2ad619c22 -s ours am: abf969db2c -s ours am: 3effc59509 -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: I234496a0f9721285de60dd9bbbe553f3b25fd793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:15 +00:00
Bill Yi 3c14c49dc9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 74b56cdf68 -s ours am: aec7e63142 -s ours am: a75da6cffa -s ours am: bd632b3b7f -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: I6cbfecf8ee18100721cd3eda7e7a986d308f308e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:13 +00:00
Bill Yi b0389ab732 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2ad619c22 -s ours am: ee08f51cbc -s ours am: 968828b132 -s ours am: 7dd5df316f -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: I85b498901bd11c5a269f55e35a54ecc98199a7ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:05 +00:00
Bill Yi c7071bd1e9 [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 skip reason: subject contains skip directive

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

Change-Id: If6efa5c44d0a18c797efa5c3f40fda89a606581f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:38:02 +00:00
Bill Yi e1afb2f092 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 039df45c67 -s ours am: 2affe7cd35 -s ours am: 575f25eb20 -s ours am: dcbcba1f4d -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: I13247f04a1f24f35c6b069df31c35d495a0594a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:37:53 +00:00
Bill Yi 1cf7358646 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 14d76c5fe6 -s ours am: 8da1a58e6a -s ours am: 0c50e8571d -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: I88df6f7ae6250a2ba902d4b2322222ce783960ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:37:46 +00:00
Bill Yi c1b003bae3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 14d76c5fe6 -s ours am: e6e002212b -s ours am: 228ad96110 -s ours am: 94f4a0e012 -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: Id05f4b85d782ab886e05b044350ce0ffea0f4f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:37:39 +00:00
Bill Yi 7468a9f36b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6dbeb857dd -s ours am: 23cab2aefe -s ours am: ae50f72fcc -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: I4599d3deee51b75bb1b2d074eeb03b5dd7069457
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:27:29 +00:00
Bill Yi 85d39517e4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6dbeb857dd -s ours am: c7aea24632 -s ours am: 4e0439e0f9 -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: Ia5d17bccc6b3b9a5ca9ed5a3c476105ec41872fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:27:26 +00:00
Bill Yi 8d96c9b001 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6dbeb857dd -s ours am: 23cab2aefe -s ours am: af1f24fd26 -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: I39f35558b142c7dc77ebf2244c1db3597f80909d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:26:00 +00:00
Bill Yi 455c1bf79c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6dbeb857dd -s ours am: 23cab2aefe -s ours am: b708191740 -s ours am: f98dc0c5a5 -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: I2118be7b26eef24c90a048e600302694abbb51fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:25:48 +00:00
Automerger Merge Worker 86157ec18d Merge changes from topic "am-352985f888d641f78c6c89f939d5bd5b" into udc-qpr-dev-plus-aosp 
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 74b56cdf68 -s ours am: aec7e63142 -s ours am: ad56d714e9 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2ad619c22 -s ours am: ee08f51cbc -s ours am: 2a6d26dbec -s ours
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 039df45c67 -s ours am: 2affe7cd35 -s ours am: ad3a90fd92 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 14d76c5fe6 -s ours am: e6e002212b -s ours am: b9ceea3652 -s ours
 2023-07-08 19:24:49 +00:00
Bill Yi f3323236ee [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 74b56cdf68 -s ours am: 2bb722ebb2 -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: I59e520a1605cb957f087269cc49172d392042cfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:24:07 +00:00
Bill Yi 789fdd65eb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f2ad619c22 -s ours am: 8e107adc58 -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: I2180e07f627867cfbcb843ce734bfc7d424d6c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-07-08 19:23:58 +00:00