David Duarte
f30455ae4c
Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f
am: 889aa2cdda
am: 46fd70f5e9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176
Change-Id: I8bb4793579c1f411396c44a993e8f14259f4f2fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-19 00:01:35 +00:00
David Duarte
bd9a70184c
Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f
am: 414feacede
am: 9b5e6b8b69
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176
Change-Id: I797141caba6b3c0f19f7dfeb07d0b4cf500f6996
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 23:59:48 +00:00
David Duarte
7822c58be7
Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f
am: 889aa2cdda
am: 6fd428956e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176
Change-Id: I6bc1dcb5a516a0cef374c663fa63344e1de71f5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 23:58:37 +00:00
David Duarte
88521c503d
Merge "Revert "Revert "Remove CSIP/VCP enable/disable from Setting""" into udc-dev am: 2920cad66f
am: ba0c3d698e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23105176
Change-Id: Iefb459893983203e9d2cd74bbb1d9515c3972de9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 23:14:48 +00:00
David Duarte
46fd70f5e9
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: I1d93f62feac935c10dea88d01a16170dbae1013a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 23:14:30 +00: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
ba0c3d698e
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: I0103526a3f590cb9d2673143f32566e6366e99ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 22:26:25 +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
Bill Yi
93fea872a7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f1e3e4680b
-s ours am: c0081daf78
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281837
Change-Id: I031a2d7e42b43424fdcacafe928984d359adb628
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 20:07:37 +00:00
Bill Yi
5ceadf2acc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 245213ef30
-s ours am: 4bae519128
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281837
Change-Id: I30c2a0b4e868e57d8e3bfe982314179cc2833a30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 20:07:31 +00:00
Bill Yi
e167bad8a6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6ea15d4b95
-s ours am: 86c1cea5e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281739
Change-Id: I74a41d3f86b286fac3b23a611eb3797a7c56d68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 20:07:25 +00:00
Bill Yi
9d99ed029e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c81b238626
-s ours am: 000cc48265
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281739
Change-Id: Ib181e14fa76c25a9955d9fb871bed6f0636f916b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 20:06:53 +00:00
Bill Yi
02fd77eeed
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4fc4c207f7
-s ours am: f3b120afb0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280853
Change-Id: I13eead0f9b81de917703d6838eea43a1f0cae9af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 20:06:32 +00:00
Bill Yi
f1ffed110f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d4eef3f33
-s ours am: bf85d5dcf3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280853
Change-Id: I53a6dd18520524db70cd22f3e53e362ef82d3ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 20:06:13 +00:00
Bill Yi
c0081daf78
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: f1e3e4680b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281837
Change-Id: Id0ed26e095ea277fe8982b67cedc68c826051863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 18:41:02 +00:00
Bill Yi
4bae519128
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 245213ef30
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281837
Change-Id: I7f48c835611b785a9f7f45c8b07fa834816af616
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 18:40:59 +00:00
Bill Yi
86c1cea5e7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 6ea15d4b95
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281739
Change-Id: I231e0dc967e9aff257e0513a4301f3ecad8c6241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 18:40:53 +00:00
Bill Yi
000cc48265
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c81b238626
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23281739
Change-Id: I43ab0fdae54009d9e21052826709e589391da219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 18:40:45 +00:00
Bill Yi
f3b120afb0
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev am: 4fc4c207f7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280853
Change-Id: Ia603a3244d6e89540077c6c49728cd55e9df818b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 18:40:12 +00:00
Bill Yi
bf85d5dcf3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d4eef3f33
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23280853
Change-Id: I5947b503f69ce22638cac430b8c5a4352daf464b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-18 18:39:38 +00:00
Bill Yi
f1e3e4680b
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-18 17:22:22 +00:00
Bill Yi
6ea15d4b95
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev
2023-05-18 17:22:22 +00:00
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
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