Nick Chameyev
0effcbca84
[Unfold animation] Do not preemptively start the animation if it has run already
...
Currently if we open an app, unfold the device and then go to home
screen we will start the unfold animation preemptively in Launcher
because Launcher activity will receive updated configuration change
(where isTablet = true) only after going back to home screen, not
when unfolding the device.
This causes a problem because SystemUI won't send the unfold animation
events after going back home as the animation has already run, so we
end up with wrongly started animation in Launcher.
This CL fixes the issues by checking if SystemUI has finished the
animation (or if it is currently running) to avoid preemptive animation
start in this case. This is done by subscribing to the original
unfold transition progress provider which emits progress events
sent through IPC from SystemUI.
Bug: 285150685
Bug: 293131586
Test: open an app on folded screen, unfold, go to home screen =>
check that icons are not squished
Test: fold/unfold when launcher is open
(cherry picked from commit 6d756970e7 )
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e53f5ef97a02d25f508774e82985e24dc2f4d2d )
Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: Ic437ff4d19cbd5764635f3007d99880622150f5b
2023-08-12 00:26:39 +00:00
Andy Wickham
5a70c4567d
Merge "Enable Toast launch animations flags by default" into udc-qpr-dev am: c928369894 am: ff489b30ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24308821
Change-Id: Ic39b037542a2172e6170bdd68072341f88b0d69b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-12 00:16:00 +00:00
Vinit Nayak
9c159e3861
Merge "Animate Split invocation with shell transitions" into udc-qpr-dev am: 8488a7e757 am: 050cfbeb10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24392742
Change-Id: Ie7e14f26ed21ca5a0dafeca186126c622f004e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-12 00:14:26 +00:00
Andy Wickham
ff489b30ac
Merge "Enable Toast launch animations flags by default" into udc-qpr-dev am: c928369894
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24308821
Change-Id: I2729d867dd92578fadc07df669ca2a405b65344f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 23:34:05 +00:00
Vinit Nayak
050cfbeb10
Merge "Animate Split invocation with shell transitions" into udc-qpr-dev am: 8488a7e757
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24392742
Change-Id: I2834012cb573bfc031d02be80c382916c583362b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 23:32:23 +00:00
Andy Wickham
c928369894
Merge "Enable Toast launch animations flags by default" into udc-qpr-dev
2023-08-11 23:21:31 +00:00
Vinit Nayak
8488a7e757
Merge "Animate Split invocation with shell transitions" into udc-qpr-dev
2023-08-11 22:29:59 +00:00
Vinit Nayak
9cf30a3e85
Merge "Prevent setting mIsStashed in TaskbarStashController" into udc-qpr-dev am: f49367cd96 am: 9304143cd1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24374676
Change-Id: If7f5ba3c4bf46b08ee5d4ed7bba4f0c42947e373
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 20:08:04 +00:00
Vinit Nayak
6458c11699
Animate Split invocation with shell transitions
...
* SplitRoot1/2 and the split left/right roots, but
they also have a parent that's the top-most split root.
* We have to explicitly set the alpha on top most parent
for animations on children to be visible
* This path wasn't being used even w/ shell transitions
enabled but became active after ag/24346391
Test: Launch split from overview and workspace
Flag: None
Bug: 276361926
Change-Id: I267dccbf3402af9b0972371b856a79b7785f986c
2023-08-11 12:59:18 -07:00
Sunny Goyal
c1d1e68a82
Removing some unused overrides in Launcher
...
> Changing AddItemActivity to use RemoteAnimation directly
to avoidTransitionManager override
Bug: 273828110
Test: Manual
Flag: N/A
Change-Id: I49777e7eeba00319476b0a239bc1cdac37833457
2023-08-11 12:31:49 -07:00
Vinit Nayak
9304143cd1
Merge "Prevent setting mIsStashed in TaskbarStashController" into udc-qpr-dev am: f49367cd96
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24374676
Change-Id: I5fa6f41a3f0fc16fa104706aa5591a0872f5bbcd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 19:19:36 +00:00
Luca Zuccarini
c3c75c28b0
Enable Toast launch animations flags by default
...
Bug: 270394041
Bug: 270394392
Bug: 262778448
Bug: 293863913
Flag: ENABLE_SEARCH_RESULT_BACKGROUND_DRAWABLES
Flag: ENABLE_SEARCH_RESULT_LAUNCH_TRANSITION
Test: manual
Change-Id: I9019d76045e3f6d931c99c0fc14435b52d8671bf
2023-08-11 18:36:40 +00:00
Vinit Nayak
f49367cd96
Merge "Prevent setting mIsStashed in TaskbarStashController" into udc-qpr-dev
2023-08-11 18:32:43 +00:00
Colin Cross
4cc251e6c1
Fix kotlin nullable errors in Launcher3
...
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.
This relands I26edfec35dca14abe90b08e3c74de0446eda95d2 with a fix in
SplitSelectDataHolder.kt to call createPackageContext when user is null
instead of asserting that it is not null.
Bug: 294110802
Test: builds
Test: WMShellFlickerServiceTests
Change-Id: I4525d0fa83a1db9cc5cff90f340fc3f863537c01
Merged-In: I4525d0fa83a1db9cc5cff90f340fc3f863537c01
2023-08-11 11:29:10 -07:00
Colin Cross
abf18e9c03
Fix kotlin nullable errors in Launcher3
...
Fix kotlin nullable errors that were exposed by setting the retention
of android.annotation.NonNull and android.annotation.Nullable to
class retention.
This relands I26edfec35dca14abe90b08e3c74de0446eda95d2 with a fix in
SplitSelectDataHolder.kt to call createPackageContext when user is null
instead of asserting that it is not null.
Bug: 294110802
Test: builds
Test: WMShellFlickerServiceTests
Change-Id: I4525d0fa83a1db9cc5cff90f340fc3f863537c01
2023-08-11 11:28:54 -07:00
Sam Dubey
c398b3e32f
Merge "Revert "Fix kotlin nullable errors in Launcher3"" into udc-qpr-dev-plus-aosp am: cfee307359
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24403814
Change-Id: If33d41368f045fecc5ef86432db4d48517c32d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 13:48:48 +00:00
Sam Dubey
cfee307359
Merge "Revert "Fix kotlin nullable errors in Launcher3"" into udc-qpr-dev-plus-aosp
2023-08-11 13:21:59 +00:00
Sam Dubey
1b481e1973
Revert "Fix kotlin nullable errors in Launcher3"
...
This reverts commit 7943b35a71 .
Reason for revert: Seems to be breaking flicker tests b/295447665, will verify before submitting. This change could be WAI (or surfacing issues)
Change-Id: Ic240c29539f41490cf7232bd6a7a944a868f3870
2023-08-11 11:52:38 +00:00
Colin Cross
960d91142e
[automerger skipped] Merge "Fix kotlin nullable errors in Launcher3" into main am: fc786807ad am: 9f7fab352b -s ours am: 5589b9bd39 -s ours am: 86c3fd002c -s ours am: 1cfb810394 -s ours
...
am skip reason: Merged-In I26edfec35dca14abe90b08e3c74de0446eda95d2 with SHA-1 2608381792 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2702133
Change-Id: I3db478eb2541f31c3f1a7f153ccb211a2fe6f13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 08:19:06 +00:00
Colin Cross
1cfb810394
[automerger skipped] Merge "Fix kotlin nullable errors in Launcher3" into main am: fc786807ad am: 9f7fab352b -s ours am: 5589b9bd39 -s ours am: 86c3fd002c -s ours
...
am skip reason: Merged-In I26edfec35dca14abe90b08e3c74de0446eda95d2 with SHA-1 2608381792 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2702133
Change-Id: I622c1f1de83bf10260ebbfffa2e314de699d6c86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 07:30:05 +00:00
Android Build Coastguard Worker
57f15d7f80
[coastguard skipped] Merge sparse cherrypicks from sparse-10644925-L75300000962528215 into udc-release.
...
COASTGUARD_SKIP: If54a4f4d8ed5e882b38ab475b68f6e312c9423f1
COASTGUARD_SKIP: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: I008d32f49cac005501b6c0e2e512d03a952156ac
2023-08-11 07:20:05 +00:00
Android Build Coastguard Worker
61f3140a20
Merge cherrypicks of ['googleplex-android-review.googlesource.com/23447960'] into sparse-10644925-L75300000962528215.
...
SPARSE_CHANGE: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: If54a4f4d8ed5e882b38ab475b68f6e312c9423f1
2023-08-11 07:16:14 +00:00
Nick Chameyev
413a2346cb
[Unfold animation] Do not preemptively start the animation if it has run already
...
Currently if we open an app, unfold the device and then go to home
screen we will start the unfold animation preemptively in Launcher
because Launcher activity will receive updated configuration change
(where isTablet = true) only after going back to home screen, not
when unfolding the device.
This causes a problem because SystemUI won't send the unfold animation
events after going back home as the animation has already run, so we
end up with wrongly started animation in Launcher.
This CL fixes the issues by checking if SystemUI has finished the
animation (or if it is currently running) to avoid preemptive animation
start in this case. This is done by subscribing to the original
unfold transition progress provider which emits progress events
sent through IPC from SystemUI.
Bug: 285150685
Bug: 293131586
Test: open an app on folded screen, unfold, go to home screen =>
check that icons are not squished
Test: fold/unfold when launcher is open
(cherry picked from commit 6d756970e7 )
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:2e53f5ef97a02d25f508774e82985e24dc2f4d2d )
Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
Change-Id: Ic437ff4d19cbd5764635f3007d99880622150f5b
2023-08-11 07:15:14 +00:00
Colin Cross
86c3fd002c
[automerger skipped] Merge "Fix kotlin nullable errors in Launcher3" into main am: fc786807ad am: 9f7fab352b -s ours am: 5589b9bd39 -s ours
...
am skip reason: Merged-In I26edfec35dca14abe90b08e3c74de0446eda95d2 with SHA-1 2608381792 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2702133
Change-Id: If279617019c0ad8d123cb93ebfd562f80f25fb22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 06:48:26 +00:00
Colin Cross
d9a6a63628
[automerger skipped] Fix kotlin nullable errors in Launcher3 am: 2608381792 am: 4b5bfb7096 -s ours am: aeb4233894 -s ours
...
am skip reason: Merged-In I26edfec35dca14abe90b08e3c74de0446eda95d2 with SHA-1 7943b35a71 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24392740
Change-Id: Ib77106ac3daaf03a5499b14a03fafd97f2a3b4a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 06:48:06 +00:00
Colin Cross
aeb4233894
[automerger skipped] Fix kotlin nullable errors in Launcher3 am: 2608381792 am: 4b5bfb7096 -s ours
...
am skip reason: Merged-In I26edfec35dca14abe90b08e3c74de0446eda95d2 with SHA-1 7943b35a71 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24392740
Change-Id: If7ff2fd4668ffa153cb2f668b15e3fb733bfadba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 06:01:27 +00:00
Colin Cross
5589b9bd39
[automerger skipped] Merge "Fix kotlin nullable errors in Launcher3" into main am: fc786807ad am: 9f7fab352b -s ours
...
am skip reason: Merged-In I26edfec35dca14abe90b08e3c74de0446eda95d2 with SHA-1 2608381792 is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2702133
Change-Id: I8cabfa50aaf7ced869d02febea8eb043dba90fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 06:01:11 +00:00
Colin Cross
4b5bfb7096
Fix kotlin nullable errors in Launcher3 am: 2608381792
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24392740
Change-Id: Ia6fd37aa0a437da84b5b3108b49f0e9edb95a794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 05:20:53 +00:00
Colin Cross
9f7fab352b
Merge "Fix kotlin nullable errors in Launcher3" into main am: fc786807ad
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/2702133
Change-Id: Ia1f973cc7e67c3a51bf0ec80489df09f16f4cb73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 05:19:55 +00:00
Colin Cross
fc786807ad
Merge "Fix kotlin nullable errors in Launcher3" into main
2023-08-11 04:40:48 +00:00
Colin Cross
e364bd07b0
Merge "Fix kotlin nullable errors in Launcher3" into udc-qpr-dev-plus-aosp am: fefa3937f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24392456
Change-Id: I0a207be78eb9ada53bddf8a5683af91c3ba224ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 03:49:53 +00:00
Colin Cross
fefa3937f2
Merge "Fix kotlin nullable errors in Launcher3" into udc-qpr-dev-plus-aosp
2023-08-11 03:04:17 +00:00
Android Build Coastguard Worker
ce1e526f4a
Snap for 10643491 from b043c7ced0 to udc-qpr1-release
...
Change-Id: I8261f66d815b6a4fc86c4e9c70d9f68710a1f1ee
2023-08-11 01:25:11 +00:00
Treehugger Robot
96d3abea58
Merge "Disabling flash checks for the whole LauncherDragView" into udc-qpr-dev am: b043c7ced0 am: 6ddc449370
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24376060
Change-Id: I2d97f10aeccecfa179c8a672354c3c66753f6993
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 00:52:52 +00:00
Treehugger Robot
6ddc449370
Merge "Disabling flash checks for the whole LauncherDragView" into udc-qpr-dev am: b043c7ced0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24376060
Change-Id: Id489e1832c58a0502b63bc050b032bb17506c027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-11 00:05:20 +00:00
Treehugger Robot
b043c7ced0
Merge "Disabling flash checks for the whole LauncherDragView" into udc-qpr-dev
2023-08-10 23:03:33 +00:00
Thales Lima
e7caf696c0
Merge "Create specs for hotseat" into udc-qpr-dev am: 19c41f5932 am: 333bea8931
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24179026
Change-Id: I763f4cdfe619382f5708108d21146e06e6536269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 22:18:18 +00:00
Hyunyoung Song
b8cc92df6a
Merge "Turn ENABLE_LONG_PRESS_NAV_HANDLE flag to server side flag" into udc-qpr-dev am: 1788bdad7f am: 57a992ba25
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24384821
Change-Id: I0588b3ac1194789f62852b12677625a3f4f82808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 22:16:52 +00:00
Brian Isganitis
016cfade66
Merge changes from topic "taskbar-search-ime" into udc-qpr-dev am: c4247d85b4 am: b7eb932dd5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24247103
Change-Id: Ia9d701cb652794b71ff75dae2da6a2c2da3fd660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 22:14:37 +00:00
Brian Isganitis
02f1e6ca52
Animate AbstractSlideInView translation shift with PendingAnimation. am: 0a036e9c15 am: 74dfcccf73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24344079
Change-Id: Ib2b860694dad1aabf3d2c7d8a819bf6c085e8639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 22:14:32 +00:00
Jordan Silva
59c4b55d23
Fix workspace and hotseat paddings for responsive grid in landscape am: 3646a1b7e1 am: 0e44e42392
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24295555
Change-Id: Ieac1a2346bd1ecb96e7a31ac7a9421b9ce887974
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 22:12:14 +00:00
Schneider Victor-tulias
ffab156b62
Merge "Update All Set page vibrations on large screens" into udc-qpr-dev am: 087990668b am: 6f0cafc738
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24299295
Change-Id: I98dc747a8bf3423d455b6a29215b80dac6b63151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 21:48:52 +00:00
Hyundo Moon
a6a3e85254
Merge "Revert "Test: unfold_to_widgets"" into udc-qpr-dev am: fa3bd7dc8a am: 2d342c8808
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24380505
Change-Id: I81ea8bbbea4138d0e65cce196d16200828e7bcbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 21:01:00 +00:00
Thales Lima
333bea8931
Merge "Create specs for hotseat" into udc-qpr-dev am: 19c41f5932
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24179026
Change-Id: I40e94ec3c8163445fe5f7b4a00437adb7389a0cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 20:26:42 +00:00
Hyunyoung Song
57a992ba25
Merge "Turn ENABLE_LONG_PRESS_NAV_HANDLE flag to server side flag" into udc-qpr-dev am: 1788bdad7f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24384821
Change-Id: Ia29d617bea7a9fa30a19aff7e93181861f9de29f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 20:20:15 +00:00
Thales Lima
19c41f5932
Merge "Create specs for hotseat" into udc-qpr-dev
2023-08-10 20:08:38 +00:00
Doğancan Emek
e4086d85f5
Merge "Test: unfold_to_widgets" into udc-qpr-dev am: 47caf4af5d am: 560bb42791
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24356173
Change-Id: I8d153c13648940b82b0ea6cdfc3297dd66b507c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 19:21:50 +00:00
Sebastián Franco
07d86ddd78
[automerger skipped] Revert "Remove flags ENABLE_TWO_PANEL_HOME FOLDABLE_WORKSPACE_REORDE and FOLDABLE_SINGLE_PAGE" am: 1f4d56c01e am: 17897f045a -s ours
...
am skip reason: Merged-In I10b9e99734b14cbbe8d1190300493099a1f28a24 with SHA-1 363706d73f is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24348348
Change-Id: If2b3168ddd1bb03bd2a2cd7f63a2b7b9b4426fca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 19:21:38 +00:00
Anushree Ganjam
e0b04b7fb1
Merge "Add a new attribute for TEXT_HEADER_ROW" into udc-qpr-dev am: 393dcb246e am: 4eda420b4f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24327091
Change-Id: Id14f2dd0d815784ac29603e41ebbdb831fc7d5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 19:21:18 +00:00
Vadim Tryshev
f069e1c47c
Merge "Implementing detector of view flashes" into udc-qpr-dev am: 7ed637b050 am: b4f7a7a490
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24331680
Change-Id: I12b0086dd28afaf95f6da8c12fa776b4b07c7af9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 19:21:02 +00:00