PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,110 Commits 1 Branch 0 Tags
a2a3d37e288503796bc717d805afc357fe00485c
Commit Graph

124110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michał Narajowski
039fd6adf6 Merge changes from topic "late-bonding" into udc-dev am: a0c24932ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23317620

Change-Id: I75617229e5e6126b249af4e9602878159543fb46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 07:52:28 +00:00
Michał Narajowski
f38b16808b bt: Add late bonding confirmation mechanism am: 63d37a3d78 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23276700

Change-Id: Ibc59792c6d9a2d2e893fca32c534fc01250ac47d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-19 07:52:25 +00:00
TreeHugger Robot
f6c0e2d4dd Merge "Avoid hotspot band updates when country code is inactive" into udc-dev 2023-05-19 07:40:54 +00:00
Michał Narajowski
a0c24932ee Merge changes from topic "late-bonding" into udc-dev 
* changes:
  bt: Show additional message when is late bond
  bt: Add late bonding confirmation mechanism
 2023-05-19 07:34:50 +00:00
Angela Wang
a6f33abf53 Add new bond entry to HearingAidInfoReported 
There's a new pairing page in "Settings > Accessibility > Hearing devices" which will initiate the bonding process. Add this page as a new bond entry to make logging more explicit.

Bug: 283203351
Test: m statsd_testdrive & statsd_testdrive 513
Change-Id: I562a435c60cb1046cd62459c40604a25aa308aef
 2023-05-19 06:03:55 +00:00
Ankita Vyas
46b106c487 Remove GET_ACTIVITIES flag while fetching installed apps from package 
manager.

This flag adds more info in return data(not required for this usecase) which increases parcel size.

Bug: 278294334
Test: manual
Change-Id: Ifba7a184aa8c3f5a70d85ddd3910f17bf91f9444
 2023-05-19 05:50:39 +00:00
Weng Su
8b7e0d7c88 Avoid hotspot band updates when country code is inactive 
- The SAP usable channels cannot be queried when the country code is not activated, causing UI to display wrong design

Bug: 280554293
Test: Manual test
atest -c WifiHotspotRepositoryTest

Change-Id: I58e8879438d7a630808aa2c4b69f21eb19968ab1
 2023-05-19 12:51:50 +08:00
David Duarte
9b5e6b8b69 Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f am: 414feacede 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

Change-Id: Ie0afa7a4ff0b53a8730a8b1e9713acf5c59fe142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 23:14:06 +00:00
David Duarte
6fd428956e Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f am: 889aa2cdda 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

Change-Id: I848b57bccf9b4cd3774fd367db1053146c54358c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 23:11:56 +00:00
David Duarte
414feacede Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

Change-Id: I4bbb93e4879c668e6e350e0e7a41ba0c11494b24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 22:29:26 +00:00
David Duarte
889aa2cdda Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176

Change-Id: I021a71139d6cd453735e279167984863b982dbf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 22:26:34 +00:00
David Duarte
2920cad66f Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev 2023-05-18 21:58:59 +00:00
Michał Narajowski
01164fd414 bt: Show additional message when is late bond 
Sometimes the cached bluetooth device is not found and we the
BluetoothPairingController does not know if this device is a member of a
set. But if this is a late bond then it is a set member so we still want
to display that additional message.

Bug: 282193044
Test: manual
Tag: #feature
Change-Id: I9e7da093b118a81097dc83460e9b93ce2e477482
 2023-05-18 15:50:10 +00:00
SongFerngWang
d010dddaa0 To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 am: be615f9351 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: Ia91ac1f46d96ff04e75fcc5e9c52da6bacfbc584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 11:13:45 +00:00
SongFerngWang
8b35fb1a1d To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 am: 64281594d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: Ie19c94f9bc88263312d1e1d1ac0c6c728993b7f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 11:12:02 +00:00
Michał Narajowski
63d37a3d78 bt: Add late bonding confirmation mechanism 
If a coordinated set member is bonding late the user will be notified and
asked for confirmation on pairing with this device. The dialog box will
display specific message for this case.

Bug: 282193044
Test: manual
Tag: #feature
Change-Id: Ie9d79282dd432a542ea02ef477019be6dfbce997
 2023-05-18 10:47:12 +00:00
Weng Su
4c1dd91695 Restrict Printing Settings 
- Don't show Printing Settings if the user is restricted by UserManager.DISALLOW_PRINTING

Bug: 269122009
Test: manual test
atest -c PrintSettingsFragmentTest

Change-Id: I15db778ebc4de3c8a76505043fab1ee02db3f290
 2023-05-18 18:40:48 +08:00
SongFerngWang
64281594d1 To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: I715fcfd8d93f557a485b2caba663fd8bb40851f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 10:31:41 +00:00
SongFerngWang
be615f9351 To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: I2b7c50fad0b06cbbe5d9417d136feb498d1f112c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 10:31:39 +00:00
SongFerngWang
ef7a75c394 To refresh/register/unregister all of the devices with same groupId 
Since the LE audio have two or more devices in the same group and
the UI show their status at one preference, the UI need to register
callback for each of the devices, and also refresh the deviceList.

Bug: 278155752
Test: local test to pairing the device and check the battery part
Change-Id: I2fcde92a1f68b8437465b234820f7bad13dfc444
 2023-05-18 16:28:52 +08:00
Daniel Norman
cd868ca92b Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 9b6494cfcb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: I3529eb71d47271bebf4d30837dd4802a811516aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:39:13 +00:00
Daniel Norman
d7f544572d Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 5a48445bf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: Idda4f7602d7bf921ed74995bb9c39f8bb3d21ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 03:39:06 +00:00
Daniel Norman
9b6494cfcb Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: If405f63827deee2908b1366bf3099274d76debfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 01:33:30 +00:00
Daniel Norman
5a48445bf1 Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: I1764ea065f17a3f1ddb01739d8bc6036ee377b46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 01:28:39 +00:00
Daniel Norman
aa46e3d39d Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev 2023-05-18 00:39:50 +00:00
Treehugger Robot
55601a3d22 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours am: ef7d5b407c -s ours am: e476d48fc7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8d21cb9a21de8208af4fc9e0b2302579a41e58e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:09:13 +00:00
Bill Yi
b6ef1bcae4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 1686903bde -s ours am: bf2f91de1f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I5887c44b6e83d4558a2995a4fd2f94acf13f6017
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:09:08 +00:00
Treehugger Robot
4366d87cbf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours am: 2722d0887b -s ours am: fa5b9dc846 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia8d23ef02259254b4d10105db557920d7df74914
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:07:07 +00:00
Bill Yi
5f7c7d56ae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 66dc9d023f -s ours am: f24204bb1c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I471870c42d120e4bc3b35c8294b190482c50cc3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:07:05 +00:00
Treehugger Robot
e16005ac8f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours am: 2722d0887b -s ours am: ae18b5b863 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7c505fa3e2320a877571703190df24a638be3b1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:03:53 +00:00
Bill Yi
f019df166a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 66dc9d023f -s ours am: a2a2d5875b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2f9a1c2da668b5edba368946dc02bb807ebcd27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:03:50 +00:00
Bill Yi
cec5098f19 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21 -s ours am: f6ece5c0ab -s ours am: e0b712d439 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73a3ccbf6424cb1f57f35e6e3b3581150d164808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:03:21 +00:00
Bill Yi
d575256881 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59 -s ours am: 55356a71e8 -s ours am: 1f8eda570b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I3d9df3346fdd96080a4e1257ce851bd3fda14b60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:03:13 +00:00
Treehugger Robot
e476d48fc7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours am: ef7d5b407c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I753f9352d6ad732587c00e381c1635afc17fe5a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:02:58 +00:00
Bill Yi
bf2f91de1f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 1686903bde -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id681e91b0adcee84bdc6d755631e8d3c477d452c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:02:53 +00:00
Treehugger Robot
ae18b5b863 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours am: 2722d0887b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic3b8f74e4bf2a1764986ad01278c6e6781d71abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:02:14 +00:00
Bill Yi
a2a2d5875b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 66dc9d023f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If30817a36df77ee0eda604c2ab9a3fb5389ec428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:02:10 +00:00
Bill Yi
d4c9006363 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21 -s ours am: f6ece5c0ab -s ours am: b033f649d3 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2560a235e9e9289a13584b38b9a5fb1f3ae2d2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:01:31 +00:00
Bill Yi
8f675f4147 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59 -s ours am: 55356a71e8 -s ours am: 009dc2dec8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1f08cdfe3f7f8ca3f8b0c2e60c8980711e476ad4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:01:23 +00:00
Bill Yi
e0b712d439 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21 -s ours am: f6ece5c0ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I13c856de0a7413af609173dd78408e90059886a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:01:15 +00:00
Bill Yi
1f8eda570b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59 -s ours am: 55356a71e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36bf7c8f1b4c953fc8e862d4b04f4169d75c44ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-18 00:01:06 +00:00
Treehugger Robot
fa5b9dc846 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours am: 2722d0887b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6c50d156f013c3413edec680100a86f8f05cc7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 23:22:42 +00:00
Bill Yi
f24204bb1c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 66dc9d023f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibcdfb642ed89113614b4e9dbab206b126e0150b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 23:22:37 +00:00
Bill Yi
b033f649d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21 -s ours am: f6ece5c0ab -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I299b182c33d2ae8648c41ef0a1ecb5267effa33c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 23:22:05 +00:00
Bill Yi
009dc2dec8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59 -s ours am: 55356a71e8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If2a42a755132b6181b6282c8e80a5feed8658e70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 23:21:59 +00:00
Treehugger Robot
ef7d5b407c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9c45339402f3217ba4b9efce60bceba8849cdc87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 23:18:49 +00:00
Bill Yi
1686903bde [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib7e14ca0a58437c78fddf82d7dbc8eaa23f5fbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 23:18:44 +00:00
Treehugger Robot
2722d0887b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 19935236b0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f0603225c14df979d568805b6231a4b735b6471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 23:17:55 +00:00
Bill Yi
66dc9d023f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I379560c568a5fc02b2f163348a145ea8f20b61ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 23:17:52 +00:00
Bill Yi
f6ece5c0ab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: d83c9c6f21 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ifb7fd62b577b15673f9f4b3279fd524b0e855339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-17 23:16:23 +00:00