Sunny Goyal
adfbec8d4e
Merge "Log appear animation's scale factor" into udc-dev am: 7a080a7e0f am: 0b1089978f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24154592
Change-Id: I23624392e6bcde0f97ee4302c75a6e5b7f3fa671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 21:03:39 +00:00
Sunny Goyal
0b1089978f
Merge "Log appear animation's scale factor" into udc-dev am: 7a080a7e0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24154592
Change-Id: Ibf1f54176e73578fc9cd1cc2510022e3c6a84237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 20:39:57 +00:00
Sunny Goyal
7a080a7e0f
Merge "Log appear animation's scale factor" into udc-dev
2023-08-04 20:13:43 +00:00
Bill Yi
6cf39f2857
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 39e9688873 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24316145
Change-Id: I0966ed68da37b2cbfbc54b9b2e0de783c44f38f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-04 19:35:32 +00:00
Bill Yi
39e9688873
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic65ee5796da63c3999571e23307fffec332bebfe
2023-08-03 21:56:20 -07:00
Fengjiang Li
2303acd7d4
Log appear animation's scale factor
...
Test: Grabbed a bug report b/291974797
Flag: N/A
Bug: 290320302
Change-Id: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf
Merged-In: Ic33dc94806b838a03a2203bdd5701a1eeaeeb7bf
2023-08-03 14:25:00 -07:00
Treehugger Robot
03241a5c28
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 2234a8252d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24300134
Change-Id: I9514b980302bff83afb341f92443364cd2c75a98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 00:38:29 +00:00
Bill Yi
fa1583041d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 22c51bf135 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24300134
Change-Id: Ied34306a93542839f02ac838176699e9e0b22ccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-03 00:38:14 +00:00
Treehugger Robot
2234a8252d
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev
2023-08-03 00:02:58 +00:00
Sunny Goyal
1ba5f1e186
[automerger skipped] Merge "[Unfold animation] Do not preemptively start the animation if it has run already" into udc-dev am: 343b896081 am: 85d1a1cea1 -s ours
...
am skip reason: Merged-In Ic437ff4d19cbd5764635f3007d99880622150f5b with SHA-1 2e53f5ef97 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23447960
Change-Id: I55d626474f1011a8430d7f78f147fd2e6d21d319
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 22:02:55 +00:00
Sunny Goyal
644d85ad0d
Merge "[Unfold animation] Do not preemptively start the animation if it has run already" into udc-dev am: 343b896081 am: 9e10ffc553
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23447960
Change-Id: I9587890282eacc4cb29f626591aefedad9078208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 22:00:22 +00:00
Sunny Goyal
85d1a1cea1
Merge "[Unfold animation] Do not preemptively start the animation if it has run already" into udc-dev am: 343b896081
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23447960
Change-Id: I7fa7f4ae8e69f8ae07f1b38053d2f738c2e35726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 21:35:37 +00:00
Sunny Goyal
9e10ffc553
Merge "[Unfold animation] Do not preemptively start the animation if it has run already" into udc-dev am: 343b896081
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23447960
Change-Id: I38c903a70bb637d78403a29a468d6722269553dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-02 21:34:25 +00:00
Bill Yi
22c51bf135
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I289e821ff4b091ffa506a3176f27a884e0c1dde3
2023-08-02 14:18:50 -07:00
Sunny Goyal
343b896081
Merge "[Unfold animation] Do not preemptively start the animation if it has run already" into udc-dev
2023-08-02 20:51:13 +00:00
Nick Chameyev
2e53f5ef97
[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
Change-Id: Ic437ff4d19cbd5764635f3007d99880622150f5b
Merged-In: Ic437ff4d19cbd5764635f3007d99880622150f5b
(cherry picked from commit 6d756970e7 )
2023-08-02 11:41:53 +00:00
Sebastián Franco
32e0bb887e
Disable FOLDABLE_SINGLE_PAGE am: 8d606e89d3 am: ce836c83a6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24231346
Change-Id: Ic70aca31e57496572adab05228f28fa618b7be2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-31 17:42:08 +00:00
Sebastián Franco
ed918f3935
Disable FOLDABLE_SINGLE_PAGE am: 8d606e89d3 am: 5e740e5d15
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24231346
Change-Id: Iacb206b6f17d81bc4fa8330d6d9b8e750bce5295
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-31 17:41:54 +00:00
Sebastián Franco
5e740e5d15
Disable FOLDABLE_SINGLE_PAGE am: 8d606e89d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24231346
Change-Id: I9aaf13f64be8fa29022a7107472735048560e0a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-31 16:58:41 +00:00
Sebastián Franco
ce836c83a6
Disable FOLDABLE_SINGLE_PAGE am: 8d606e89d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24231346
Change-Id: I47ce4d7e6f88b2577f70db63e818c4f2566b5f10
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-31 16:57:30 +00:00
Sebastián Franco
8d606e89d3
Disable FOLDABLE_SINGLE_PAGE
...
The functionality should go back to the same as with phones.
There shouldn't be issues with the reorder or similar behavior since we
are switching form using the MultipageCellLayout to the regular
CellLayout.
The things we need to pay attention to is the the behavior of having two
panels like adding the right number of panels when loading (folding, unfolding and rotating).
Bug: 291822492
Change-Id: I903873e32f35c5ee9e0f3da8581a37d4087d021f
Test: ReorderWidgets
Merged-In: I903873e32f35c5ee9e0f3da8581a37d4087d021f
2023-07-28 22:16:52 +00:00
Automerger Merge Worker
ee973a3c00
Merge changes from topic "am-0044f066ae544b2db72e3759316cdaf7" into udc-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c78664766e -s ours am: a1ebb61476 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdab72c00 -s ours am: 54b663017a -s ours
2023-07-27 20:55:10 +00:00
Automerger Merge Worker
2d4d14f3b9
Merge changes from topic "am-340505ec150944a9b88ef5fcec38b52a" into udc-d1-dev-plus-aosp
...
* changes:
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c78664766e -s ours am: 7ef4b4a037 -s ours
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdab72c00 -s ours am: d636ef0772 -s ours
2023-07-27 20:50:39 +00:00
Bill Yi
bcb6172c04
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c78664766e -s ours am: a1ebb61476 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24210348
Change-Id: I99455409722953218c18b73a265c5566be7de873
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:49:45 +00:00
Bill Yi
3560547415
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdab72c00 -s ours am: 54b663017a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24210348
Change-Id: I94ddba79f8dffe3ae90a41ae948f4bcc0d0a0a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:49:35 +00:00
Bill Yi
19242c159c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c78664766e -s ours am: 7ef4b4a037 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24210348
Change-Id: Ia3e1c1091dbaf6b82449142757c7b934408f0289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:47:54 +00:00
Bill Yi
3cddea5742
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdab72c00 -s ours am: d636ef0772 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24210348
Change-Id: Ice638593c34041d046280e14f1bba0a91bd229e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:47:43 +00:00
Treehugger Robot
bbeef30b97
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6fed3c88c4 -s ours am: b14567e102 -s ours am: d842dcce36 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211308
Change-Id: I2a80a2922f5bde1041fc7fa1ea479da41b1e093b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:47:14 +00:00
Bill Yi
35e02a40b2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d8cca7c8cb -s ours am: d87d21baa3 -s ours am: 7eddcfb4f7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211308
Change-Id: I1028e3b18032a3b849eee8d17af027adaa4ba18a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:47:07 +00:00
Bill Yi
a7d7b5b901
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7350b79bfb -s ours am: 2a2b8fe6f7 -s ours am: 87dca9f10e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211310
Change-Id: If180df8cb0910b85f0aa8ae2dcb268be6aa66ac6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:46:41 +00:00
Bill Yi
7ef4b4a037
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c78664766e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24210348
Change-Id: Ic48f44edc66f781ab4bc5ef9df2ac3fe329d15a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:20:12 +00:00
Bill Yi
d636ef0772
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdab72c00 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24210348
Change-Id: I3450f559ee22e456d602cd6015a0e7e99e1ac3e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:20:02 +00:00
Bill Yi
a1ebb61476
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: c78664766e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24210348
Change-Id: I41dd3ee75a1860f574858ce0ae2074b9fd48ce82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:17:51 +00:00
Bill Yi
54b663017a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: efdab72c00 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24210348
Change-Id: I95ab4c7246b44df26eeb02d23d3f0f3fd9620cbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:17:37 +00:00
Treehugger Robot
b0a774f3ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6fed3c88c4 -s ours am: b14567e102 -s ours am: 9bc2590f7f -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211308
Change-Id: I9e1473cae2050d53d8269061f398c43be3163f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:05:00 +00:00
Bill Yi
1d521c4424
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d8cca7c8cb -s ours am: d87d21baa3 -s ours am: c46f57cf4e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211308
Change-Id: I54389b52f53fa1383bfb54a3c512fa5a77490d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:04:53 +00:00
Bill Yi
87739676fd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7350b79bfb -s ours am: 2a2b8fe6f7 -s ours am: 513f5bf67c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211310
Change-Id: I6955fa846262100ba2e21b9110eace37633caa53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:04:28 +00:00
Treehugger Robot
9bc2590f7f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6fed3c88c4 -s ours am: b14567e102 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211308
Change-Id: I4a8cddc35ea1b4429166159b677f84d386441db5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:01:56 +00:00
Bill Yi
c46f57cf4e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d8cca7c8cb -s ours am: d87d21baa3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211308
Change-Id: I78dc0b50d81010ca0136036cac697cfe2a91dce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:01:48 +00:00
Bill Yi
513f5bf67c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7350b79bfb -s ours am: 2a2b8fe6f7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211310
Change-Id: Ieb158001c4b3395b3910ff060b5eba87679f2ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:01:23 +00:00
Treehugger Robot
d842dcce36
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6fed3c88c4 -s ours am: b14567e102 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211308
Change-Id: Ibdff8a923a9634605ee1f8225bbef077944f2d8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:00:48 +00:00
Bill Yi
7eddcfb4f7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d8cca7c8cb -s ours am: d87d21baa3 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211308
Change-Id: I6430918b2681c5022243792f9c2fcbb5f5f65ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:00:39 +00:00
Bill Yi
87dca9f10e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7350b79bfb -s ours am: 2a2b8fe6f7 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211310
Change-Id: Ifc8aa5ec188409d849de43ff80f90816041b3734
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 20:00:15 +00:00
Bill Yi
c78664766e
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev
2023-07-27 19:21:11 +00:00
Treehugger Robot
b14567e102
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6fed3c88c4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211308
Change-Id: Icd2980a367f1e9e23f802fc92762ce02c22b64ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:20:02 +00:00
Bill Yi
d87d21baa3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d8cca7c8cb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211308
Change-Id: I9f85944234447dd5eee42b3a372a6817d11a78a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:19:51 +00:00
Bill Yi
2a2b8fe6f7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7350b79bfb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24211310
Change-Id: I53f6ddba02bbc6fbb8fa8227e6f304a5201d8a11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-27 19:05:13 +00:00
Treehugger Robot
6fed3c88c4
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-07-27 18:23:30 +00:00
Bill Yi
7350b79bfb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I96cce710ae4548fa8f50f996e2f4528ce35c6840
2023-07-26 08:01:31 -07:00
Bill Yi
d8cca7c8cb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ica6034d7c219f6275ea2110d1689a15fa34c69c5
2023-07-26 07:59:31 -07:00