Commit Graph

78507 Commits

Author SHA1 Message Date
Tony Wickham 0165aa82c6 Merge "Update folder leave-behind color for taskbar" into tm-qpr-dev 2023-03-21 16:38:46 +00:00
Jon Miranda e5d60e2d85 Merge "Add a way to fade out taskbar view when closing an app in the taskbar." into tm-qpr-dev am: 149246f077 am: ce06cf89b0 am: 6e816aaf37 am: 7a0f9873a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22141153

Change-Id: Iedc7f2355fd4cf1100aeeb07572ab4bbd071ff9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 16:11:54 +00:00
Jon Miranda 86adbbe43a Merge "Add a way to fade out taskbar view when closing an app in the taskbar." into tm-qpr-dev am: 149246f077 am: ce06cf89b0 am: 6e816aaf37 am: 79cb30066c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22141153

Change-Id: Iacd3b7c0421e61252eb00e2936b2b08d5f49ca8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 16:11:08 +00:00
Jon Miranda 79cb30066c Merge "Add a way to fade out taskbar view when closing an app in the taskbar." into tm-qpr-dev am: 149246f077 am: ce06cf89b0 am: 6e816aaf37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22141153

Change-Id: Idebb37d9a36d87ee3cbbd7ed30c1208a76bb9c4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 14:55:12 +00:00
Jon Miranda 7a0f9873a2 Merge "Add a way to fade out taskbar view when closing an app in the taskbar." into tm-qpr-dev am: 149246f077 am: ce06cf89b0 am: 6e816aaf37
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22141153

Change-Id: Ic9f9a10990b83154a32fed4fd71a152ede7a0996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 14:54:37 +00:00
Jon Miranda 6e816aaf37 Merge "Add a way to fade out taskbar view when closing an app in the taskbar." into tm-qpr-dev am: 149246f077 am: ce06cf89b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22141153

Change-Id: I919b45021c1fbc2a5d5c30c2d5eca71a672cd5be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 14:14:43 +00:00
Jon Miranda ce06cf89b0 Merge "Add a way to fade out taskbar view when closing an app in the taskbar." into tm-qpr-dev am: 149246f077
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22141153

Change-Id: Ia0212c2829b01c5b0faf120d6303b7cf6d147ad6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 13:33:32 +00:00
Jon Miranda 149246f077 Merge "Add a way to fade out taskbar view when closing an app in the taskbar." into tm-qpr-dev 2023-03-21 13:01:30 +00:00
Mike Schneider 7b410f24b4 Do not perform invisible transitions while the screen is off.
This change caches whether launcher was active at the time of the screen
off, and assumes this last state when the screen is actually off.

While trying to understand the code, I renamed a couple class-internal
methods and flags, plus added comments. If they are not accurate, its
due to a misunderstanding on my part, and I will gladly revisit and
check whether all the assumptions I made still hold.

Bug: 261418621
Test: manually

Change-Id: I2ad25caf478100781a063c356c5fd2d20d3e1917
2023-03-21 10:27:13 +00:00
randypfohl 35aa157c47 Updating overview tutorial to new simple tutorial flow am: 1c0a27a28e am: 127329fe46 am: f977979374 am: 1540affbd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22163527

Change-Id: I5524bea358dfd047592e67393ac03167712435b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 08:07:20 +00:00
randypfohl 726cfb768f Updating overview tutorial to new simple tutorial flow am: 1c0a27a28e am: 127329fe46 am: f977979374 am: 1f12d66eb3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22163527

Change-Id: Ib701f64fcc192d76ad07ea44ed800e126ad9205c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 08:05:54 +00:00
randypfohl 1f12d66eb3 Updating overview tutorial to new simple tutorial flow am: 1c0a27a28e am: 127329fe46 am: f977979374
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22163527

Change-Id: Iceb46593925a80962363e10b9ba2a0a54515cd6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 06:53:46 +00:00
randypfohl 1540affbd0 Updating overview tutorial to new simple tutorial flow am: 1c0a27a28e am: 127329fe46 am: f977979374
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22163527

Change-Id: Id0c62d90216948b3b2cbefd4e9b3d6ae5849e85a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 06:53:33 +00:00
Hyunyoung Song a38aab93b9 Revert "Revert "Hide the splash icon when launching with no view..."
Revert submission 21916962-revert-21447384-no-splash-UILAXIUPKJ

Reason for revert: Retry errorprone target

Reverted changes: /q/submissionid:21916962-revert-21447384-no-splash-UILAXIUPKJ
Flag: production issue. Not hidden behind flag
Bug: 269343536
Test: manual

Change-Id: Ia365f886d39d63472d72afc2033fc67e19109f57
2023-03-20 23:33:11 -07:00
randypfohl f977979374 Updating overview tutorial to new simple tutorial flow am: 1c0a27a28e am: 127329fe46
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22163527

Change-Id: I22b4cefb0ec8e241e04b1ceb70644e9ea17ea7bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 06:13:32 +00:00
randypfohl 127329fe46 Updating overview tutorial to new simple tutorial flow am: 1c0a27a28e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22163527

Change-Id: I0658dc8bbb4d92d46f29c8851415de49164ea64d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 05:36:11 +00:00
Android Build Coastguard Worker bc5fe2e952 Snap for 9781601 from 4202d43e48 to udc-release
Change-Id: Id00b644604756efe5cb4042f6899cabc75aadfd6
2023-03-21 03:27:07 +00:00
Jon Miranda 4c63bfbd09 Merge "Tune springs when app animates home into the hotseat on devices with a taskbar." into tm-qpr-dev am: fad8c1c449 am: 03bb5fe49c am: 4202d43e48 am: d0aa0ae839
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146526

Change-Id: Id51158880fa45c79324d9cccc42d71025faad034
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 02:39:15 +00:00
Sunny Goyal c51c02f2eb Merge "Scale folder if it doesn't fit the screen" into tm-qpr-dev am: d2a34a2d54 am: 92e392d55b am: 717072d1d5 am: 9bd34cba39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22139063

Change-Id: Ib9547e9e61659c89f1930da3c20caa405f83a894
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 02:23:17 +00:00
Saumya Prakash fba75120b2 Merge "Redesign the gesture tutorial for the Back gesture" into tm-qpr-dev am: 60c419b9b7 am: 813a373212 am: 36095202d1 am: 872a65be1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21779343

Change-Id: I9460e993647195e85bbfe24323a2b3be2e04f4a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 02:23:05 +00:00
Jon Miranda 8074c04eab Merge "Taskbar motion polish to keep icons within taskbar bg bounds." into tm-qpr-dev am: 8a53e78f22 am: 9c2a40576e am: c5d3518763 am: b2cfea4e22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22133846

Change-Id: I69850241c75a246f0dd171b63f847e9e46d68ee1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 02:22:56 +00:00
Stefan Andonian 09d7f4317c Merge "Revert "Revert "Enable CONTINUOUS_VIEW_TREE_CAPTURE FeatureFlag.""" into udc-dev am: 6da4ac41cc am: 9ab3ac26f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22107734

Change-Id: I01d55dbbb6a10ed3f0d78fdb34964d11ab21b80a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 02:22:46 +00:00
Jon Miranda ff1ec74c06 Merge "New taskbar thresholds." into tm-qpr-dev am: d95c511b2c am: 5ce4bd3412 am: 4235a94958 am: 286d0d6ec5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22140107

Change-Id: Idece373ca225d5f3a7878a8c972fe96e2c5be763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 02:22:33 +00:00
Jon Miranda 6f6209e50d Merge "Keep foreground drawable centered during app open/close animation." into tm-qpr-dev am: ad94440c5f am: d0c8aa31bd am: a479a6e3fd am: 23e789584d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22140592

Change-Id: Ib5e2b2c6bbcc74cffb9c78c55c3c1124add0432d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 02:19:29 +00:00
Jon Miranda e7ac3d89f4 Merge "Tune springs when app animates home into the hotseat on devices with a taskbar." into tm-qpr-dev am: fad8c1c449 am: 03bb5fe49c am: 4202d43e48 am: 2a9bc4f8f1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146526

Change-Id: I325c5a33c5190d9bde5987cabfb58bb988872f6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:11:49 +00:00
Automerger Merge Worker a20b1df701 Merge "Merge "Revert "Move recents animation controller to shell"" into udc-dev am: ee75235a59 am: cc6e2c1b00" 2023-03-21 01:03:28 +00:00
Sunny Goyal 3100a858d9 Merge "Scale folder if it doesn't fit the screen" into tm-qpr-dev am: d2a34a2d54 am: 92e392d55b am: 717072d1d5 am: c54ec22061
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22139063

Change-Id: I34c9349228e9f4b4895c99a3eb2c5058cd22a8c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:03:14 +00:00
Saumya Prakash 0d8e4a2e88 Merge "Redesign the gesture tutorial for the Back gesture" into tm-qpr-dev am: 60c419b9b7 am: 813a373212 am: 36095202d1 am: 018853d0d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21779343

Change-Id: I7ce90d105aa71e7c4eed0bc41dbd4f10d546f611
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:03:00 +00:00
Jon Miranda 7a4ae1ae2c Merge "Taskbar motion polish to keep icons within taskbar bg bounds." into tm-qpr-dev am: 8a53e78f22 am: 9c2a40576e am: c5d3518763 am: 7c48ba378b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22133846

Change-Id: I5d143248f3ac3660bd321069dea226d07faab134
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:02:51 +00:00
Stefan Andonian fc72d00bc9 Merge "Revert "Revert "Enable CONTINUOUS_VIEW_TREE_CAPTURE FeatureFlag.""" into udc-dev am: 6da4ac41cc am: 9f801ce332
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22107734

Change-Id: I35abfd40a01db88ab074e539877a0ef306f8ffa8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:02:42 +00:00
Sam Dubey 50db780ed7 Merge "Revert "Move recents animation controller to shell"" into udc-dev am: ee75235a59 am: cc6e2c1b00
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22162929

Change-Id: I6b3f08cb55c0197eb72d2a6c4b1253b4a5e97e4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:02:40 +00:00
Jon Miranda aa62eaade1 Merge "New taskbar thresholds." into tm-qpr-dev am: d95c511b2c am: 5ce4bd3412 am: 4235a94958 am: bb1d610fc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22140107

Change-Id: I77aa7062b9159b852fd391cea48a3c0e87bb0a5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:02:32 +00:00
Automerger Merge Worker abb87ad7ac Merge "Merge "Keep foreground drawable centered during app open/close animation." into tm-qpr-dev am: ad94440c5f am: d0c8aa31bd am: a479a6e3fd am: ba0b2a001a" 2023-03-21 01:02:24 +00:00
Sunny Goyal 9164336f90 Merge "Fixing overscroll getting lost due to float point comparision" into udc-dev am: 19691f60f1 am: bbf44d9882
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22102392

Change-Id: I31a1041778fcd6e9c22ae08dc809938870ffffa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:02:18 +00:00
Jon Miranda e5ea444f3b Merge "Keep foreground drawable centered during app open/close animation." into tm-qpr-dev am: ad94440c5f am: d0c8aa31bd am: a479a6e3fd am: ba0b2a001a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22140592

Change-Id: I55361734e3f35d865316f8b5597814039a639d4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-21 01:02:17 +00:00
Sam Dubey 2f35699edb Merge "Revert "Move recents animation controller to shell"" into udc-dev am: ee75235a59 am: 44ace0d7de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22162929

Change-Id: I82db390e084c17d7470a98459cd58657978941dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 23:45:05 +00:00
Sunny Goyal cd1208a105 Merge "Fixing overscroll getting lost due to float point comparision" into udc-dev am: 19691f60f1 am: 7910f8c107
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22102392

Change-Id: I29cbc2045e973b0d620dee4f5ac1e3ec63600324
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 23:44:36 +00:00
Nick Chameyev 29608c1ff6 Merge "[Unfold animation] Adjust animation parameters" into tm-qpr-dev am: 927875c6cd am: 1b08ab957e am: 663c6610d2 am: 9efeb995a7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21850203

Change-Id: Id4ae6f552cfa5eeb90c298c40ddca04d06166f8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 23:43:41 +00:00
Saumya Prakash 5a7a23bd3c Enable the redesigned gesture navigation tutorial
Bug: 270396257
Bug: 241813570
Test: N/A
Change-Id: I49a548b69da37aecf422c08b932592befc1a2cf8
2023-03-20 23:30:35 +00:00
Bill Yi 353e4d1582 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 2b9441c79d -s ours am: 1c3aadaac8 -s ours am: c86678ef41 -s ours am: 147306ae84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ce801c8c599057337983654950552d45f633132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 23:21:09 +00:00
Bill Yi 23c18f3619 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ce6faed5c8 -s ours am: 22d4c94b70 -s ours am: 5f0dece6c0 -s ours am: 2f00acf1a0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaa5b820dc2bdb700a9d2aaf03a734e7707f8388c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 23:20:54 +00:00
Jon Miranda a9e32e1274 Merge "Fix QSB flicker when returning home." into tm-qpr-dev am: 5b01486024 am: 28d2bc872a am: 849f008b9b am: c70a6d3386
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22118378

Change-Id: I483da3117669745c76ae98f8da1cc7bb8d11b091
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 23:18:17 +00:00
randypfohl 1c0a27a28e Updating overview tutorial to new simple tutorial flow
test: built and tested on multiple devices. recorded videos and shared in chat.

bug: b/253520701, b/253521660, b/241813570

Change-Id: I57f88f5fb35c6a7b1219fac6e992bb84354b91ef
2023-03-20 23:16:10 +00:00
Automerger Merge Worker a0841d8559 Merge changes from topic "am-b5c99e68d6324fec9bfdd30d69903bc0"
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d08c41e7ab -s ours am: 8215098eef -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a8ebe6afa5 -s ours am: 5e41c9baf2 -s ours
2023-03-20 23:09:36 +00:00
Nick Chameyev 70e53760a6 Merge "[Unfold animation] Adjust animation parameters" into tm-qpr-dev am: 927875c6cd am: 1b08ab957e am: 663c6610d2 am: ca5b1cc8a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21850203

Change-Id: I8f70e47077b39a29b51ea88334307e305774428a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 23:06:25 +00:00
TreeHugger Robot 6c41cbaff6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d08c41e7ab -s ours am: 8215098eef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I025c6b363fb4663c868d920181dbd040ea047c5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 23:06:01 +00:00
Bill Yi 25cebc5eb8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a8ebe6afa5 -s ours am: 5e41c9baf2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4fee11d3fc89af7f838b26c0cb8cb48ffee7586b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 23:05:50 +00:00
Schneider Victor-tulias dc25fca903 Add debug logs to help investigate view and activity leak test failures.
Flag: not needed
Test: MemoryTests
Bug: 260260325
Change-Id: Ie9ed8e607c574e81696a4246f701534c18cf0b7c
2023-03-20 15:54:47 -07:00
Jon Miranda 2a9bc4f8f1 Merge "Tune springs when app animates home into the hotseat on devices with a taskbar." into tm-qpr-dev am: fad8c1c449 am: 03bb5fe49c am: 4202d43e48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146526

Change-Id: If689dc824d9be78b2fa5d578c3c2dcbc29be4a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 22:54:44 +00:00
Jon Miranda d0aa0ae839 Merge "Tune springs when app animates home into the hotseat on devices with a taskbar." into tm-qpr-dev am: fad8c1c449 am: 03bb5fe49c am: 4202d43e48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146526

Change-Id: Id290102ac237b2a8a60efb5bc52da105fe66d202
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-20 22:53:25 +00:00