Commit Graph

1619 Commits

Author SHA1 Message Date
Sunny Shao
946f52b2a1 Merge "Revert "Nullability Annotations replacement"" into main 2023-12-29 03:18:24 +00:00
Sunny Shao
19d1d3d15d Revert "Nullability Annotations replacement"
This reverts commit cf0501e4d7.

Reason for revert: b/317462033, it seems a flaky but revert it first.

Change-Id: Ie1d5e279cca6477fc17d8c27c1ecda8d7a6b2553
2023-12-29 02:28:24 +00:00
Haijie Hong
debcc28413 Move hasHeadTracker to background thread in device details page
BUG: 316490612
Test: atest BluetoothDetailsSpatialAudioControllerTest
Change-Id: Ic9ca426190bd6389c05272416c87fbf9da392abd
2023-12-26 13:20:16 +08:00
Haijie Hong
204f36c7cb Merge "Provide Spatializer in BluetoothFeatureProvider for Spatial Audio toggle" into main 2023-12-21 03:14:08 +00:00
sunnyshao
cf0501e4d7 Nullability Annotations replacement
-- Replace the android.annotation.Nullable / android.annotation.NonNull
   with androidx.annotation.Nullable / androidx.annotation.NonNull

Bug: 316867690
Test: build pass
Change-Id: I0c1da55dfb09ece855151c47e0492d6f46538621
2023-12-20 08:50:09 +08:00
Haijie Hong
cce5ff810d Provide Spatializer in BluetoothFeatureProvider for Spatial Audio toggle
BUG: 316490612
Test: atest BluetoothDetailsSpatialAudioControllerTest
Change-Id: I7fdb671d5395e08c517af58e88b4aeb48f193e5d
2023-12-18 06:32:32 +00:00
Yiyi Shen
22e3f51784 [Audiosharing] Update media devices section.
1. Filter out the media devices in audio sharing from the section.
2. During the audio sharing, click the media device will lead to
   stopping the sharing.

Flagged with enable_le_audio_sharing

Bug: 305620450
Test: atest AvailableMediaBluetoothDeviceUpdaterTest.java
Change-Id: I0676fd5aa98e593c6a5458845fc1b1631a5a6698
2023-12-06 18:25:09 +08:00
Vlad Popa
f782872cfd Disable the Bt categorization list when audio type is known
The audio framework can deduce the type with the help of the
BluetoothDevice metadata API. In case this is known we will grey out the
list with the manual selection of the audio device type.

Test: adb shell device_config put media_audio android.media.audio.automatic_bt_device_type true
Test: atest BluetoothDetailsAudioDeviceTypeControllerTest
Bug: 302323921
Change-Id: Ia2cab27f2dce5493aa4326333699b5908d8a09ee
2023-11-30 18:08:01 -08:00
Rongxuan Liu
d153a82f20 Merge "Control broadcast assistant profile connection with le toggle" into main 2023-11-20 18:32:06 +00:00
Rongxuan Liu
54c2f4dd4b Control broadcast assistant profile connection with le toggle
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsProfilesControllerTest
Test: manual test with le toggle and check bass profile is
enabled/disabled
Bug: 300227308

Change-Id: If61b1edadb24b53661bb74173c243826f31956ae
2023-11-17 23:59:43 +00:00
Angela Wang
c01677b676 Merge "Removes hearing aids settings page flag" into main 2023-11-14 06:47:36 +00:00
Alice Kuo
24ef70212d Show LE audio toggle summary as default connection is classic
Bug: 310092817
Test: manual test
Change-Id: I733650a129dcbc9ab3acbb758c5a619359e25e4e
2023-11-13 18:11:31 +08:00
Angela Wang
01f17822c3 Removes hearing aids settings page flag
The hearing aids settings page has successfully rolled out. Cleans up the codes that are related to flag controls.

Bug: 310203155
Test: atest AccessibilityHearingAidPreferenceControllerTest
Test: atest AccessibilityDetailsSettingsFragmentTest
Test: atest BluetoothDetailsHearingDeviceControlsControllerTest
Change-Id: Ib03952f734302cca8519cb1c70ba82601cb75527
2023-11-10 17:06:32 +00:00
Hyundo Moon
946e94bb5d Send bluetooth permission reply intent only to BT package
Bug: 292540708
Test: make SettingsGoogle -j;
      Also manually tested clicking 'Allow' to message permission
      request dialog.
Change-Id: I3c339de2bf3bacd1e70f8dc8b0352aa83da14195
2023-11-06 05:56:40 +00:00
Chaohui Wang
c4a3a50d58 Migrate to CompoundButton
Switch and SwitchCompat are both CompoundButton.

Using CompoundButton in Java will helps migration in the future.

Bug: 306658427
Test: manual - on affected pages
Change-Id: I7cdc2601879a85d33f77239e38263320d5a6984e
2023-10-25 14:57:48 +08:00
Chaohui Wang
e752f7214b Remove unused SwitchBar
Only used in tests, so also migrate the tests.

Bug: 306658346
Test: manual - on bluetooth
Test: m RunSettingsRoboTests
Change-Id: Id2b010c1d9c32abe21dcc8765e9446fc4f7a5b25
2023-10-25 12:17:49 +08:00
Chaohui Wang
cfdb3b1f1b Migrate new() to SwitchPreferenceCompat
Bug: 306658427
Test: manual - on Settings pages
Change-Id: I258a8c63d5c46403c6d333a9d2f34c33cb35e27f
2023-10-24 14:05:34 +08:00
Guojing Yuan
31fe9920ce Merge "[CDM PS] Fix an NPE when the device is not associated" into main 2023-10-16 17:16:56 +00:00
Chelsea Hao
ad3dede7c7 Merge "Show toggle summary for LE audio toggle only when the device is not in the allowlist." into main 2023-10-16 10:05:22 +00:00
Guojing Yuan
b139406d4b [CDM PS] Fix an NPE when the device is not associated
Bug: 290063372

Test: manually tested
Change-Id: Ifd55e2849ebaff1340fdf9e61edd75971187e12b
2023-10-12 17:40:53 +00:00
Alice Kuo
ddec75bb39 Config LE audio connection by default
Use LE audio connection by default, and allow to have the differenct
configuration per project (system property). As using LE audio connection by
default, the toggle, "Show LE audio toggle in Device Details", would be
useless, hide this toggle based on the project configuration

Bug: 300012501
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeDeviceDetailsPreferenceControllerTest
Change-Id: Ia4df48d6a71b5b9f11bd91a69971c8393412da13
2023-10-13 01:22:36 +08:00
chelseahao
74b85e4247 Show toggle summary for LE audio toggle only when the device is not in the allowlist.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsProfilesControllerTest
Change-Id: I68040e7e92630f6efac0e1fb0f35a39ebca3cfad
2023-10-12 09:39:08 +00:00
Angela Wang
6b95155040 Merge "Fix pair other ear button not hidden correctly for dual device" into main 2023-10-12 05:45:27 +00:00
Angela Wang
79c7623f1b Fix pair other ear button not hidden correctly for dual device
If the device is a dual device which supports both ASHA + LE Audio, it'll pair the other ear with CSIP and group it as a member device. If LE Audio is not enabled, the current logic will fail to recognize the other ear is already paired. Update the logic to well handling this situation.

Bug: 296646732
Test: atest BluetoothDetailsPairOtherControllerTest
Change-Id: Iba9655488203a242ad0e87764d6bf4df595e977d
2023-10-11 15:36:17 +00:00
Haijie Hong
8d0c67408e Make bluetooth toggle be on when Bluetooth is turning on
The logic should be similar to the Wi-Fi one: https://android.googlesource.com/platform/packages/apps/Settings/+/refs/heads/main/src/com/android/settings/wifi/slice/WifiSlice.java#379

BUG: 293264131
Test: unit test
Change-Id: I1222f9f793b91d81d74ed9358f1b055d3049866e
2023-10-10 13:34:23 +08:00
Haijie Hong
c2694e1ff6 Fix scrolling to wrong position issue in Bluetooth Device Details page
Bug: 294355795
Test: tested locally
Change-Id: Ic80fb7974cf30adb3112aeb826c2b5bcb0067afc
2023-09-27 08:34:37 +00:00
Peter Kalauskas
80e914a263 Enable use_resource_processor for all sysui deps
This will make the build faster

Test: m checkbuild
Bug: 295208392
Change-Id: If75acb6b1c3f204e3686c20cef609f7cfabe15cf
2023-09-21 23:09:39 +00:00
Angela Wang
e0313e1abe Merge "Hide pair other ear button after device connected via CSIP" into main 2023-09-20 05:59:08 +00:00
Treehugger Robot
d7d8184bb7 Merge "Use system properties for the le audio toggle ui config instead" into udc-qpr-dev am: 2d7a469264 am: b15719119e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24768698

Change-Id: I88024462c4587db39a5e6671223504a5b7938c49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 08:00:32 +00:00
Treehugger Robot
b15719119e Merge "Use system properties for the le audio toggle ui config instead" into udc-qpr-dev am: 2d7a469264
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24768698

Change-Id: Ie138a425906541eb2bc8f1c08a8956636363a141
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 07:05:06 +00:00
Treehugger Robot
2d7a469264 Merge "Use system properties for the le audio toggle ui config instead" into udc-qpr-dev 2023-09-19 06:31:29 +00:00
Angela Wang
7a15ecafde Hide pair other ear button after device connected via CSIP
The pair other ear button should disappear after both ears of binaural
hearing aids are connected.

Remove checking if CSIP is enabled since CSIP is always enabled in
pairing stage.

Bug: 296646732
Test: check the UI manually
Change-Id: I804819eef41b5d3754ad0a79d9fc1afc66cef5cc
2023-09-19 04:49:35 +00:00
Guojing Yuan
dfc20ff941 [CDM Perm Sync] Fix a NPE for Perm Sync toggle am: 8c51d9c71d am: cf705cf873
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24790419

Change-Id: I10fccd7b4036a57cdb665eb22a79b600fb006898
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 23:17:16 +00:00
Guojing Yuan
cf705cf873 [CDM Perm Sync] Fix a NPE for Perm Sync toggle am: 8c51d9c71d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24790419

Change-Id: I8cdf0fb8b740ffd32fac9c01aa0d4dfa51904b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-18 22:20:37 +00:00
Guojing Yuan
8c51d9c71d [CDM Perm Sync] Fix a NPE for Perm Sync toggle
Bug: 290063372

Test: manual test on the breaking build.
Change-Id: I1f0a5c3840a4c97962fa9986d8f67ab0f652015f
2023-09-18 18:44:10 +00:00
Alice Kuo
aa734eb52a Use system properties for the le audio toggle ui config instead
Config LE audio UI per devices. Change to use system properties instead

Bug: 300807171
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioDeviceDetailsPreferenceControllerTest
Change-Id: Id0d624f516b9fdbe2380e5f10da5c69b08eea6a4
2023-09-18 03:05:59 +00:00
Guojing Yuan
e0cce7bf6a Merge "[CDM] Add Permissions Sync toggle" into udc-qpr-dev am: d43d6f259a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24708184

Change-Id: I3c29e5b9a46695e5c21a837e00891cc22e0bff4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:49:46 +00:00
Guojing Yuan
5f86e8ff03 [CDM] Add Permissions Sync toggle
Bug: 290063372

Test: manually tested the toggle
Change-Id: I75d4370eed98275e2f99d65620229bdb57193fb8
Merged-In: I75d4370eed98275e2f99d65620229bdb57193fb8
2023-09-15 18:05:37 +00:00
Guojing Yuan
ac64ce5153 Merge "[CDM] Add Permissions Sync toggle" into main 2023-09-13 17:37:58 +00:00
Yuanru Qian
369b3f3ef9 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d am: 22a947a156 am: ea691aca93
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: Ia0fa5945c13561d2d43f01ea05e8dee420adfcac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 18:43:09 +00:00
Guojing Yuan
756d23cad1 [CDM] Add Permissions Sync toggle
Bug: 290063372

Test: manually tested the toggle
Change-Id: I75d4370eed98275e2f99d65620229bdb57193fb8
2023-09-12 18:02:38 +00:00
Yuanru Qian
ea691aca93 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d am: 22a947a156
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I1a0c3b36915a42588aafdeaa41eca6fd57889350
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 17:43:15 +00:00
Yuanru Qian
22a947a156 Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3 am: 81343f23fc am: 945b20c70d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I0710a54b97a9b230c8802326687d76be7d7a51f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 17:04:28 +00:00
Yuanru Qian
81343f23fc Merge "Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS" into main am: 9ace1904c3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2745297

Change-Id: I366f3dddb68df63b2ae251e71610c4d1e33ceefe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 15:21:52 +00:00
Yuanru Qian
8ffc3c728d Update owner list for packages/apps/Settings/src/com/android/settings/bluetooth/OWNERS and packages/apps/Settings/src/com/android/settings/connecteddevice/OWNERS
Change-Id: I29c44aec3a9065dd9e0c207faaea55da6ad21471
2023-09-12 07:39:43 +00:00
Angela Wang
873936451c Merge "Redirect user to original pairing page from pair dialog" into main 2023-09-05 07:08:16 +00:00
Treehugger Robot
ef8cb92b0c Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b am: 9c21429af4 am: ed9bbf31c9 am: c9e0efd5ba am: e4d9d80f15
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: Icfbdf2683a06b4720c9819c8f7658587ab503e49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 16:40:45 +00:00
Treehugger Robot
e4d9d80f15 Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b am: 9c21429af4 am: ed9bbf31c9 am: c9e0efd5ba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: Ib944ab2e79ea349791e83a2dc7639920ac76245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 15:38:17 +00:00
Treehugger Robot
c9e0efd5ba Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b am: 9c21429af4 am: ed9bbf31c9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: I6861bf65677a4d451b53b81993d262230739e482
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 15:00:12 +00:00
Treehugger Robot
9c21429af4 Merge "Limit bluetooth broadcast password to single byte characters" into main am: abe501085b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2728234

Change-Id: Idca058c3f3d2de4324d51c9bfd0225cd44c2dbf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 13:15:08 +00:00