Commit Graph

129184 Commits

Author SHA1 Message Date
Bill Yi
4fc4c207f7 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-05-18 17:22:22 +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
Vania Januar
3042747ddb Minor fixes and tests for multiple full users for stylus notes app
Test: StylusDevicesControllerTest
Bug: 278555728
Change-Id: I0279cb8d9aba4781958e1e5937447501876919ec
2023-05-18 15:16:48 +00:00
Allen Su
bcfb1e22f6 Merge "Fix dialog disappear when screen off and on" 2023-05-18 13:17:46 +00:00
SongFerngWang
93525c07f1 To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 am: be615f9351 am: d010dddaa0 am: 2309118ea2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

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

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

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

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

Change-Id: Ie3f0977522497f9b6d93345852a56cb4938079c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 12:59:58 +00:00
Daniel Huang
f9aaa71f07 Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev am: e69db09a88 am: dc777ee31a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23260256

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

Change-Id: Ib152afd17b516ed7e1bb4e22b686e9c84ed5527d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:17:34 +00:00
Daniel Huang
dc777ee31a Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev am: e69db09a88
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23260256

Change-Id: Ic69efc116c521b49d3851b1351aee433f2b34ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:17:03 +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
e753279de9 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: I30a0b272d94a33ea9ab9d67ba547527750c23e5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:13:44 +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
SongFerngWang
761fd9386d To refresh/register/unregister all of the devices with same groupId am: ef7a75c394 am: 530393901e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23308381

Change-Id: I0fa51b4533f02f50e6ad0eec0ec01c2f5bf862b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 11:11:24 +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
530393901e 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: I0d59928f2f9f43acd558a3867ab00a95e771e453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 10:31:50 +00: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
Daniel Huang
e69db09a88 Merge "Use FeatureProvider to provide the firmware update category." into udc-qpr-dev 2023-05-18 10:27:54 +00:00
Allen Su
998933a44d Fix dialog disappear when screen off and on
Bug: 248514263
Test: by manual
Change-Id: Ieac71f57b8672204dd2bc6c1c39e473d0ffa25cf
2023-05-18 10:27:52 +00:00
danielwbhuang
6189f9fcbd Use FeatureProvider to provide the firmware update category.
1. Add KeyboardSettingsFeatureProvider in FeatureFactory.
2. Use KeyboardSettingsFeatureProvider to add firmware update UI.

Bug: 270114180
Test: manual, atest KeyboardSettingsFeatureProviderImplTest
Change-Id: I62ec7aff71dd5c0d496860363f2c5b3e992503ff
2023-05-18 17:24:43 +08: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
30fd7076ed Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: 9b6494cfcb am: cd868ca92b am: 90d893695d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

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

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

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

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

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

Change-Id: If487f7b972427547bc3a3ca9da0c6e69e17f72db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 04:26:46 +00:00
Daniel Norman
4557233528 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: Idad505b6d7666658282e159f38c946416135ec82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 03:39:47 +00: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
Treehugger Robot
b8df6b413a [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: 55601a3d22 -s ours am: 14a14c5e34 -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: Id6b067d8581c9025afa2b0bae3cb4eda5f660481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 02:13:54 +00:00
Bill Yi
5501da87dc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 1686903bde -s ours am: bf2f91de1f -s ours am: b6ef1bcae4 -s ours am: b48f3444d3 -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: I517c544a4a18f0c53835d97d52eca7cb1c7b5dbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 02:13:50 +00:00
Treehugger Robot
fed6fe7e17 [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: 4366d87cbf -s ours am: 9c3f0d9259 -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: I0b428e82f00faacdeaed946dc02da5c1972cc2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 02:10:50 +00:00
Bill Yi
b89cac6213 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 66dc9d023f -s ours am: f24204bb1c -s ours am: 5f7c7d56ae -s ours am: fc71fae125 -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: I44d2302a751e5d57ff1795be67245d6d86b61d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 02:10:47 +00:00
Treehugger Robot
56c5ae441f [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: 263049e89d -s ours am: 8c3a80939a -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: Ibf1019b3f71e2058a13faf06b66f0319bed5ac13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 02:06:05 +00:00
Bill Yi
778f77c5d0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 66dc9d023f -s ours am: a2a2d5875b -s ours am: 7ceb5fbbe9 -s ours am: f4a98863be -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: Ifc96351ae02d9050d8ede7d19d74575ab729ade4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 02:06:00 +00:00
Bill Yi
77a0883e3b [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: c73287f378 -s ours am: 6430a84c3a -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: Id9a3f880f0672ac274acb52a0dfa4bf3804301de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 02:03:19 +00:00
Bill Yi
7abba0ae52 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59 -s ours am: 55356a71e8 -s ours am: 1f8eda570b -s ours am: 6d44afeab0 -s ours am: 97b343de9a -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: I33c9513531c2661e41ce1d4a5486d11b8ad93088
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 02:03:11 +00:00
Treehugger Robot
940c4588bc [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: e16005ac8f -s ours am: e6a227f69e -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: Ia089f80a868ec7ac5559940741a384d329b82a93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 02:02:48 +00:00
Bill Yi
e23eeb7f4e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fe5e3598df -s ours am: 66dc9d023f -s ours am: a2a2d5875b -s ours am: f019df166a -s ours am: 8b283f7166 -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: Ib62c0e071954b5a35b0a2ef4f8c25e504d9accd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 02:02:44 +00:00
Bill Yi
86ebb7ca3a [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: cec5098f19 -s ours am: 5cbff3c1d6 -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: Ibcfc6e0894605bae7aea2bdf01d8fe5fb2898bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 01:58:45 +00:00
Bill Yi
d6a2b0ccc2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59 -s ours am: 55356a71e8 -s ours am: 1f8eda570b -s ours am: d575256881 -s ours am: ac2684df99 -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: Ie0e5819d6ade5a7b86f3c4de612d902bd707a858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 01:58:37 +00:00
Bill Yi
c8b7ed7498 [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: d4c9006363 -s ours am: a7f66f6db8 -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: Iec021489660f003e06cd46a2967f9710bcf9b1de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 01:57:49 +00:00
Bill Yi
e89b7bbf5a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f88b1c7f59 -s ours am: 55356a71e8 -s ours am: 009dc2dec8 -s ours am: 8f675f4147 -s ours am: b520d8211b -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: I822524f6dbd242bd76e8e1e8216299066e5d90da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 01:57:42 +00:00
Daniel Norman
b2af1bd143 Merge "Hide the a11y service enable dialog from non-a11y-tools." into udc-dev am: aa46e3d39d am: b911573296
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23267499

Change-Id: I84c3d3b5d8a9094756ebf284f938a5bb50f3a07d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 01:48:59 +00:00
Treehugger Robot
14a14c5e34 [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: 55601a3d22 -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: Idaaded2e09fccd70a120ce52124cb941ac747167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18 01:40:06 +00:00