Commit Graph

48540 Commits

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

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

Change-Id: I46e70bb2ceab07ad4da475bd3676a08dc81c12f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19 08:15:04 +00:00
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
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
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
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
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
Julia Tuttle
7034984e19 Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9 am: 2474419ac8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I88fe8929dc6cebc76430d1d810b8714c619d94e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 16:33:28 +00:00
Julia Tuttle
2474419ac8 Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: I2ec0a0f37d2d25c82da35689c2c4af3efcdc7f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 15:35:26 +00:00
Julia Tuttle
35dae4aefd Merge "Add FSI toggle to per-app notification settings" into udc-dev am: 28edfb8df9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22899254

Change-Id: Ia5524ccfb7d3eac04f5aa780494f35650824faec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 15:31:12 +00:00
YK Hung
56ce3c42bb Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f am: cdf9452261
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578

Change-Id: Ifadf784a346565d56b1345a60bf4708cbf247517
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 15:10:19 +00:00
Julia Tuttle
28edfb8df9 Merge "Add FSI toggle to per-app notification settings" into udc-dev 2023-05-17 14:48:50 +00:00
YK Hung
cdf9452261 Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578

Change-Id: I1992e2b356b78c31fc90f6b467d33f739d99e443
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 14:33:24 +00:00
Julia Tuttle
6630c852d9 Add FSI toggle to per-app notification settings
Bug: 277938609
Test: atest FullScreenIntentPermissionPreferenceControllerTest
Test: # manual, verifying against "Special app access" screen
Change-Id: I9cb0d9bc99ce59a7b0ff6bcd2cab7a3c2d63f45f
2023-05-17 14:30:49 +00:00
YK Hung
b6f257642c Merge "Fix b/282944866: Java crash" into udc-dev am: 0101e6904f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279578

Change-Id: Iaa8c51b627d423135a7cfce3a55e360493e1d233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 14:29:10 +00:00
YK Hung
0101e6904f Merge "Fix b/282944866: Java crash" into udc-dev 2023-05-17 13:45:32 +00:00
Zoey Chen
dfe8a48cab Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53 am: 9752a7be52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700

Change-Id: Ie95a9350cc910aba431e4803b16f063fc32ac8fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 11:21:05 +00:00
Zoey Chen
9752a7be52 Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700

Change-Id: I5d3cda5ac33f624a54ae3c1535575c7b56793e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 10:43:04 +00:00
Zoey Chen
3ea5aa92d8 Merge "[Regional Preference] Set numbering system when select it" into udc-dev am: 74ab90bb53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23258700

Change-Id: I359dba215d9ea74e39b528e041c34a2a90d18d05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 10:38:45 +00:00
Zoey Chen
74ab90bb53 Merge "[Regional Preference] Set numbering system when select it" into udc-dev 2023-05-17 09:44:45 +00:00
Zaiyue Xue
6235f4b69a Fix b/282944866: Java crash
Bug: 282944866
Fix: 282944866
Test: presubmit
Change-Id: I6dd9d15f21d4fcb3e75847c5727b18bdafbfa09b
2023-05-17 15:59:55 +08:00
YK Hung
6f8b5676a2 Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271 am: f6ec0ddf5b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576

Change-Id: I7c4102972ae8650f4677a061d463151f87f03618
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 06:02:48 +00:00
YK Hung
6a54517f05 Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576

Change-Id: Idd3c88bc1eb26817f3ee19046c75dd2459744fc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 06:02:33 +00:00
YK Hung
f6ec0ddf5b Merge "Add protection for the BadParcelableException" into udc-dev am: 54f39ec271
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23279576

Change-Id: Ia536e60ca56dbecbad8e49489af79527da268a94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 06:00:02 +00:00
Zoey Chen
14c81c17ce [Regional Preference] Set numbering system when select it
Should not return original locale, return the locale which is set unicodeLocaleKeyword instead

Bug: 282879594
Bug: 283036197
Test: atest NumberingSystemItemControllerTest
Change-Id: Ic572f20175ea0428be98f30fe865d826b61dcca6
2023-05-17 05:47:53 +00:00
ykhung
b42a509914 Add protection for the BadParcelableException
Test: presubmit
Bug: 282943714
Change-Id: I9f2bffbbbd3df4a31887ecc869d3c046b25755e0
2023-05-17 03:38:13 +00:00
Yanli Wan
98c03bb946 Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937 am: 433d934b89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508

Change-Id: I96a6dfc9fa2697965d3fb1eb1187645283b31fdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 00:21:51 +00:00
Yanli Wan
29a97efcf9 Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508

Change-Id: I4e11dc29b4e12e42de3cb55452902224a771c3f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 00:19:01 +00:00
Treehugger Robot
8d0bca9d4a Merge "LEA developer option is enabled if the BT LEA flag is enabled" into udc-dev am: 6814775fea am: ee1c86830d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23249483

Change-Id: Ia333520b9511ad43e737d2f3e1e10aac3602c5c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17 00:16:51 +00:00
Yanli Wan
433d934b89 Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev am: f5ce620937
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23087508

Change-Id: I05e673c9f6e1db8aabef3a66e9f8c569e96e5850
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 23:57:53 +00:00
Yanli Wan
f5ce620937 Merge "Start activity from Device Lock APEX if device is provisioned by Device Lock" into udc-dev 2023-05-16 23:47:46 +00:00
Treehugger Robot
40462b2520 Merge "LEA developer option is enabled if the BT LEA flag is enabled" into udc-dev am: 6814775fea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23249483

Change-Id: I864882abbe368c1e0883d8b68c63e7e09b5c681a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 23:36:55 +00:00
Treehugger Robot
ee1c86830d Merge "LEA developer option is enabled if the BT LEA flag is enabled" into udc-dev am: 6814775fea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23249483

Change-Id: I7e49723d26bcd27e80cfde088d3e66813fc41f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 23:36:04 +00:00
Treehugger Robot
6814775fea Merge "LEA developer option is enabled if the BT LEA flag is enabled" into udc-dev 2023-05-16 22:08:13 +00:00
Yuxin Hu
f28b2b4b83 Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74 am: 0b7a88282d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112

Change-Id: Iaa26c0dc435ab9b6f32daa9ce49f88234f349162
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 20:08:07 +00:00
Yuxin Hu
9fcd85c5f8 Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112

Change-Id: I6fcae10eabb687454e4611cd29087917c781048e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 19:05:13 +00:00
Yuxin Hu
0b7a88282d Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev am: 174bd2ab74
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23220112

Change-Id: I211c5ae0aa764a885957573622af13be0e288206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 19:04:08 +00:00
Treehugger Robot
1b61fee893 Merge "Hide "Long Background Tasks" page from Settings." into udc-dev am: b272dbc613 am: dbf7472854
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23252718

Change-Id: Iaa73048171065b9d2816e38eca5eb2bfaf97f27a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 18:40:43 +00:00
Yuxin Hu
174bd2ab74 Merge "Toggle switch back when user dismisses dialog by tapping screen" into udc-dev 2023-05-16 18:24:14 +00:00
Treehugger Robot
3c2aa8843e Merge "Hide "Long Background Tasks" page from Settings." into udc-dev am: b272dbc613
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23252718

Change-Id: Ie9099059b0af1947c2c9659e1c85012a5b90240d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 18:01:40 +00:00
Treehugger Robot
dbf7472854 Merge "Hide "Long Background Tasks" page from Settings." into udc-dev am: b272dbc613
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23252718

Change-Id: Ieee0605442ad79b198129dcb312eef7be86201f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-16 18:00:46 +00:00
Treehugger Robot
b272dbc613 Merge "Hide "Long Background Tasks" page from Settings." into udc-dev 2023-05-16 17:31:12 +00:00