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
Randy Pfohl f5bec7dd30 Merge "switching animation to screenshot to avoid visual jank" into udc-dev 2023-06-13 05:43:21 +00:00
Saumya Prakash cb5e2cfd3e Merge "Scale the gesture tutorial animation to work on smaller devices" into udc-dev 2023-06-13 05:38:01 +00:00
Saumya Prakash 846573c064 Merge "Update the strings in the gesture nav tutorial" into udc-dev am: 0d87c4766e am: e69de4abbe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23659350

Change-Id: Ia0202d3e6bac88a614376672fa066c7cd10b2df0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 05:26:22 +00:00
Saumya Prakash afda61d92c Merge "Update the strings in the gesture nav tutorial" into udc-dev am: 0d87c4766e am: 87085d3b4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23659350

Change-Id: I7718af3e47d2d076e73812f277040dd89e01e3a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 05:25:55 +00:00
Saumya Prakash 85205820d2 Merge "Update the strings in the gesture nav tutorial" into udc-dev am: 0d87c4766e am: 82d7b1d19b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23659350

Change-Id: I7ffe8c4210fe4bef1aeb84945becb1f1f41475d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 05:21:53 +00:00
Saumya Prakash 6ebddb1d52 Merge "Update the strings in the gesture nav tutorial" into udc-dev am: 0d87c4766e am: 87085d3b4a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23659350

Change-Id: I83ec0867a74a8f0bee3754e17e06fdc8379a8a99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 05:21:45 +00:00
Saumya Prakash e7bf7f55bb Merge "Update the strings in the gesture nav tutorial" into udc-dev am: 0d87c4766e am: 3b7302196d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23659350

Change-Id: I731d3f078279156025a4479b20558487b3df9d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 05:21:45 +00:00
TreeHugger Robot 9125f08c0e Merge changes from topics "draglayer-inline-qsb", "draglayer-search" into udc-qpr-dev am: a9d2db38f5 am: e361fd6a83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23624636

Change-Id: Iceea6e8b48a71caaa411ade4988c7d127bb2879f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 05:06:13 +00:00
Andy Wickham 3cdfbdc5b3 Small tweak to floating search on phone. 
When you swipe down from all apps back home, the search bar was
expanding due to the size being slightly larger when resting on
home. However this looks a bit off with the search protection,
so created this special case to keep it at the all apps size
during this transition.

Bug: 261866704
Test: Manual on tablet phone and foldable.
Flag: ENABLE_FLOATING_SEARCH_BAR
Change-Id: If9399224d0c456629d094139eef7f4d1b2c3bbc9
 2023-06-12 21:58:45 -07:00
Saumya Prakash 3b7302196d Merge "Update the strings in the gesture nav tutorial" into udc-dev am: 0d87c4766e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23659350

Change-Id: I223f0354555d69df57719ac9ef6bd1055a37ae5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 04:44:01 +00:00
Saumya Prakash 87085d3b4a Merge "Update the strings in the gesture nav tutorial" into udc-dev am: 0d87c4766e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23659350

Change-Id: I07a3637ad58d6232d8de88802cc01906ec749c81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 04:44:00 +00:00
Saumya Prakash 82d7b1d19b Merge "Update the strings in the gesture nav tutorial" into udc-dev am: 0d87c4766e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23659350

Change-Id: I1660ba4eddf5eee3f4704d58256da0a6dfae912a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 04:43:45 +00:00
Saumya Prakash e69de4abbe Merge "Update the strings in the gesture nav tutorial" into udc-dev am: 0d87c4766e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23659350

Change-Id: Idc65c2ae4c5c0b378b0cdcc2295d864951f7d026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 04:39:39 +00:00
TreeHugger Robot e361fd6a83 Merge changes from topics "draglayer-inline-qsb", "draglayer-search" into udc-qpr-dev am: a9d2db38f5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23624636

Change-Id: I41a3745d6ebf24bbdea5d0eab6117ab1a4831149
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 04:24:11 +00:00
Saumya Prakash 0d87c4766e Merge "Update the strings in the gesture nav tutorial" into udc-dev 2023-06-13 03:39:38 +00:00
TreeHugger Robot a9d2db38f5 Merge changes from topics "draglayer-inline-qsb", "draglayer-search" into udc-qpr-dev 
* changes:
  Allow LauncherState to define floating search side margins.
  Put the "floating" in ENABLE_FLOATING_SEARCH_BAR.
 2023-06-13 03:19:49 +00:00
Android Build Coastguard Worker 0d1d3e6327 Snap for 10309372 from 167ff73108 to udc-qpr1-release 
Change-Id: I3ae377c405678fd43af6d357a01f0e3b8b9bdf3a
 2023-06-13 03:19:13 +00:00
Bill Yi d1399b459f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If81e973109e91f29dd8753852bd717bdf7ce1520
 2023-06-12 20:16:31 -07:00
Bill Yi 396103b643 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I48eb3394064a8490da15cc5b74ac7ce3fe4e6c81
 2023-06-12 20:16:03 -07:00
Bill Yi 7bccc1b9cb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5d9c7a4cb39e1841b86a554fd38704694e2371e8
 2023-06-12 20:15:32 -07:00
Bill Yi 1a56350263 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie90516a03c61d3055f00b4d56e31c596faf71b15
 2023-06-12 20:14:03 -07:00
Bill Yi c0a3a10a1b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic61885d72ca32ca398a7c2b817bf7fab94de326b
 2023-06-12 20:13:36 -07:00
Bill Yi 0a1da5506f Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iddfb9398d64d2d2f29b9db947d9ad52c4c6b476e
 2023-06-12 20:13:04 -07:00
randypfohl d3cc664391 switching animation to screenshot to avoid visual jank 
Test: built locally, recorded, and slow replayed it to verify no jank/visual anomalies visible.

Bug: 245750127
Change-Id: If7e72512d3303222f4d006a9e2a1639b2f86b1af
 2023-06-12 18:28:57 -07:00
Sebastian Franco 76a1ceb5f2 Remove flags ENABLE_TWO_PANEL_HOME FOLDABLE_WORKSPACE_REORDE and FOLDABLE_SINGLE_PAGE 
Fix: 270392643
Fix: 270395070
Fix: 270395274
Test: atest FoldableItemsIntegrity
Change-Id: I2d7af312da8aeb070588ca94a2a256d2def65eeb
 2023-06-12 18:05:22 -07:00
Vadim Tryshev 4513b03758 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 27e2251b7d am: 167ff73108 am: 9d65fb046c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I1d372529498409316bd3ffaf50db65ac2da1cd49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 00:43:14 +00:00
Vadim Tryshev 0b5d6a9161 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 1a18734f42 am: a110cb6962 am: 7a2037d39f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: Id88a8aa1d0b6920ab3d2d281eea776220e0d59ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 00:43:04 +00:00
Vadim Tryshev d1296e17f6 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 27e2251b7d am: f8814d1c3c am: e9dd2f10a0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I9bccb8ab9bea6216371957973192a9e848534cd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 00:41:49 +00:00
Andy Wickham bd9a180fbc Allow LauncherState to define floating search side margins. 
This lets home screen align to workspace icons while All Apps
aligns with those icons. In addition, on tablets where the QSB
is inlined with the hotseat, floating search bar can also move
horizontally accordingly.

Bug: 275635606
Bug: 259619990
Test: Manual on tablet as well as foldable.
Flag: ENABLE_FLOATING_SEARCH_BAR

Change-Id: I67745c66390736cdf39d969ef7767096ae13c671
 2023-06-13 00:28:59 +00:00
Vadim Tryshev 9d65fb046c Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 27e2251b7d am: 167ff73108 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: Ia02cdcc1632ec97bb1207ce1911db512fd6b37d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 23:56:53 +00:00
Vadim Tryshev 7a2037d39f Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 1a18734f42 am: a110cb6962 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: Ie17a4a7ecbfd312f168b9507df35ddffe592487f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 23:54:16 +00:00
Vadim Tryshev e9dd2f10a0 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 27e2251b7d am: f8814d1c3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I7cc7263bbb1e8b1987a7fff1ee00ebe769467673
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 23:53:36 +00:00
Android Build Coastguard Worker e3b4005618 Snap for 10306978 from 77a40999e1 to udc-release 
Change-Id: Ice0032868c668c909883a45bada4b2ea9af41518
 2023-06-12 23:22:11 +00:00
Vadim Tryshev cd81292a47 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: eb4303a374 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: Id01db18fb49e9ee42f354164f9648d5f56d08921
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 23:07:48 +00:00
Vadim Tryshev a110cb6962 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 1a18734f42 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I40202c86a1bd8733ce8e7df051e28002999f98cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 23:07:29 +00:00
Vadim Tryshev 167ff73108 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 27e2251b7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I81d60e0d7d92267cadad309450a90ed39be0bc84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 23:07:01 +00:00
Vadim Tryshev 941e5355ea Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 1dbf04c62c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I0ee59e8df6161490820a76e6fdaa28a1ef85b058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 23:04:31 +00:00
Vadim Tryshev f8814d1c3c Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 27e2251b7d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: Ia3d518be4d57ee77adfded8f10fe87e134bbaba0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 23:04:29 +00:00
Vadim Tryshev 1a18734f42 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I54871c0b6f0b970f68e1746d4b013e85a18f64d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 22:23:07 +00:00
Vadim Tryshev 27e2251b7d Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I7ba5c6153938ba208976c71d137ef025094ce909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 22:23:06 +00:00
Vadim Tryshev eb4303a374 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I015eb4e54795e95132c0dc62af278acccfde7009
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 22:22:40 +00:00
Vadim Tryshev 1dbf04c62c Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I96ace6acf347f3e26803af4489f894684ac08416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 22:22:29 +00:00
Andy Wickham 64896f3098 Put the "floating" in ENABLE_FLOATING_SEARCH_BAR. 
This means adding the search view to the drag layer, so it can
persist and animate across Launcher states (i.e. Home, All Apps,
Overview, Overview from App).

Some high level things:
 - LauncherState now has a flag indicating if the floating
   search bar should be visible, as well as a method indicating
   how high it should rest when the keyboard is not showing. By
   default the height is set negative if the flag is not present,
   so the search bar will rest off screen in that state.
 - LauncherState also has a new method indicating if the search
   bar should show as a pill when not focused. Currently this is
   done in phone portrait mode in all apps and overview.
 - SearchUiManager now has a method for gestures to hint that
   the search bar will be focused or unfocused soon, e.g. for
   the app -> overview case, we hint that it will be focused
   when crossing the threshold, and unfocused if retracting.
   This allows the search bar to animate during the gesture
   and take or release focus after the state change completes.
 - AllAppsTransitionController lets the apps panel translate in
   from the bottom of the screen, for example when coming from
   an app and we don't want to pop it in halfway up the screen.
   Instead it can slide in gracefully from behind the keyboard
   and floating search bar.
 - KeyboardInsetAnimationCallback can now notify listeners of
   keyboard alpha changes during controlled animations. And
   StateAnimationConfig has a new animation type to control
   the keyboard alpha during the all apps transition.
 - This new ANIM_ALL_APPS_KEYBOARD_FADE is used to pop the
   keyboard in at the threshold for going from an app to all apps.
   Note that its position moves linearly before this, so the
   search bar starts moving up accordingly before the keyboard
   alpha is non-0.

Fix: 266761289
Fix: 268845147
Fix: 267683921
Fix: 265849321
Fix: 266446733
Fix: 269301440
Bug: 275635606
Bug: 259619990
Bug: 261866704
Test: Manual with all the state transitions on phone and tablet
(also folding/unfolding foldable).
Flag: ENABLE_FLOATING_SEARCH_BAR, ENABLE_ALL_APPS_FROM_OVERVIEW
(latter just for the background app interpolator changes).

Change-Id: I6f06552e95747348a62260279626cf407bf145b0
 2023-06-12 21:55:24 +00:00
Vadim Tryshev af641a6e80 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev 2023-06-12 21:49:39 +00:00
Brandon Dayauon 076dcdfd54 Fix custom buttons with translated string 
The reason why the buttons aren't being updated with the translated string is because the cache the views get the string from is not updated/loaded with the new language.
Rather, the update happens after the view has been inflated. With this change, when the string cache updates in bindStringCache(), we update the UI right then.

bug: 280958663
test: Manual
Change-Id: I7a49ee401d5a5f3268cfaef1abee8153e913a8ce
 2023-06-12 14:33:08 -07:00
Saumya Prakash b932cf4b64 Update the strings in the gesture nav tutorial 
Change the strings for the instructions and feedback for the gesture navigation tutorial to align with new UX changes.

Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Fix: 286547594
Test: Manually went through the redesigned tutorial and verified that
the new strings correctly show up. Also checked that the previous
tutorial remains unchanged.

Change-Id: I27a3e8c0f09e7755e6087ce5b004b687f229d153
 2023-06-12 21:26:43 +00:00
Schneider Victor-tulias 7ebb54f24e Polish redesgined tutorial home and overview animations 
- Added a 6th hotseat icon to the tablet and unfolded foldable
- not animating the previous task view when animating to hotseat from the home step
- updating the first hotseat icon's color and visibility at the correct times
- cross fading the animating task view and hotseat icon's color

Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Fixes: 283967613
Test: ran the tutorial on handheld, tablet and foldable with ENABLE_NEW_GESTURE_NAV_TUTORIAL true and false
Merged-In: I7a76646ca71502e924f45bba76d72be17d31249d
Change-Id: I7a76646ca71502e924f45bba76d72be17d31249d
 2023-06-12 21:04:38 +00:00
Schneider Victor-tulias 1c2c5a58a2 Polish redesgined tutorial home and overview animations 
- Added a 6th hotseat icon to the tablet and unfolded foldable
- not animating the previous task view when animating to hotseat from the home step
- updating the first hotseat icon's color and visibility at the correct times
- cross fading the animating task view and hotseat icon's color

Flag: ENABLE_NEW_GESTURE_NAV_TUTORIAL
Fixes: 283967613
Test: ran the tutorial on handheld, tablet and foldable with ENABLE_NEW_GESTURE_NAV_TUTORIAL true and false
Change-Id: I7a76646ca71502e924f45bba76d72be17d31249d
 2023-06-12 21:03:30 +00:00
Anushree Ganjam 5569fbd564 [automerger skipped] Merge "Remove SEARCH_ONBOARDING_COUNT & QSB_SEARCH_ONBOARDING_CARD_DISMISSED." into udc-d1-dev am: d9ee0fd054 am: 6de490db63 -s ours am: 97e29f7084 -s ours 
am skip reason: Merged-In I5374e7cab6551d44fc995adb3b3a46173169ab6c with SHA-1 ab58a0a005 is already in history

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

Change-Id: I1572e8e04273a9c47ed93c722b628300ba6eecb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:20:28 +00:00
Anushree Ganjam 021b69559b [automerger skipped] Merge "Remove SEARCH_ONBOARDING_COUNT & QSB_SEARCH_ONBOARDING_CARD_DISMISSED." into udc-d1-dev am: d9ee0fd054 -s ours am: 405e79df8d -s ours am: 2d0a4bbed6 -s ours 
am skip reason: Merged-In I5374e7cab6551d44fc995adb3b3a46173169ab6c with SHA-1 caf2c0ffb0 is already in history

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

Change-Id: I20f0e92f27c2ab70e14960b42f8cc2f43623ddee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 20:20:13 +00:00