Commit Graph

1423 Commits

Author SHA1 Message Date
Vania Januar
76452f3a1f Merge "Show single icon layout for unknown device type in advanced header." into udc-dev 2023-03-10 18:15:37 +00:00
Vania Januar
4bdff64e80 Show single icon layout for unknown device type in advanced header.
Bug: 270654477
Test: AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I24a42693a66664caa460d44245a68e3606e98481
2023-03-02 13:37:25 +00:00
Vania Januar
8ba47734ad Merge "Handle DEVICE_TYPE_STYLUS in advanced details header." into udc-dev 2023-03-02 11:46:58 +00:00
Vania Januar
c1429bcb40 Handle DEVICE_TYPE_STYLUS in advanced details header.
Bug: 270654477
Test: AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I725dd575ba56bf86e1336094961e769b81540479
2023-03-01 17:22:15 +00:00
Treehugger Robot
4767472df7 Merge "Change API name" am: a0642974a4 am: f9d1535640 am: a14b3c6be2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: I368b125ea1f96f6a70ce4eb0cbcf91150d865ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 18:48:37 +00:00
Treehugger Robot
f9d1535640 Merge "Change API name" am: a0642974a4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2445642

Change-Id: I3a96da519c41151b57e7580b0816101590322b1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 18:21:01 +00:00
Hieu Dang
8115b87ea3 Change API name
Change getCreateBondCaller to getPackageNameOfBondingApplication

Bug: 269604212
Test: atest BluetoothDeviceTest
Tag: #refactor
Change-Id: Ib596f94a6a718069ca9fb3a1c572ee3583f7504b
2023-02-19 15:11:42 +00:00
Betty Chang
fd32cde5cc Merge "To fix the footer link is not clickable in the Bluetooth Settings" 2023-02-16 02:27:00 +00:00
changbetty
3512374f62 To fix the footer link is not clickable in the Bluetooth Settings
- Links are not allowed in footer preference title now. So follow the
   Wi-Fi UX design to add the string "Change". Let the user to click and
   go to the Bluetooth scanninng settings

Bug: 265167737
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest

Change-Id: If9e666df7b987e0dbe3d550ac0af03b9d79230de
2023-02-15 14:31:49 +00:00
Jason Hsu
b93d5f183b Merge "[Audio Routing] Add audio routing functionality for hearing device" 2023-02-14 08:00:05 +00:00
jasonwshsu
31ff5d92d1 [Audio Routing] Add audio routing functionality for hearing device
* 'Ringtone', 'Call', 'Media', 'System sounds' routing capability for hearing device

Bug: 269122580
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingDeviceAudioRoutingBasePreferenceControllerTest
Change-Id: Id43b2323740bfa40c36f74dec644c00695f414c3
2023-02-14 14:45:31 +08:00
Automerger Merge Worker
a733c64a58 Merge "Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3 am: 420a8474db am: c6cbe0b6ac" 2023-02-14 02:55:50 +00:00
SongFerng Wang
daea6912b1 Merge "Add two LE audio broadcast pageId" 2023-02-14 02:55:27 +00:00
Hieu Dang
1fa42f8669 Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3 am: 420a8474db am: c6cbe0b6ac
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2424645

Change-Id: I632da7916e4a199880038e610e27219492d5bf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 02:55:06 +00:00
Hieu Dang
420a8474db Merge "Show Bluetooth dialog in a specific case" am: e1e657dac3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2424645

Change-Id: I9e231ac0e16c8e8217be53cc89335758b14be6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-14 02:02:08 +00:00
Hieu Dang
e1e657dac3 Merge "Show Bluetooth dialog in a specific case" 2023-02-14 01:55:09 +00:00
Bonian Chen
b6aae6cc3e Merge "[Settings] Avoid from accessing deprecated API getLine1Number()" 2023-02-13 07:36:12 +00:00
Bonian Chen
8f4e1ace9d [Settings] Avoid from accessing deprecated API getLine1Number()
Migrate to new APIs.

Bug: 269052593
Test: build pass

Change-Id: I76705ec303fa9a593dd3a63d5cac3bdf65258315
2023-02-13 04:42:57 +00:00
My Name
2e552331e9 Show Bluetooth dialog in a specific case
If the application that initiate the bonding with
BluetoothDevice#createBond is in foreground, then should dialog only
instead of showing the notification & dialog

Bug: 175931562
Tag: #refactor
Test: manual
Change-Id: I3673a0b58cbf9caabf62c951b84b49e17cfb13b8
2023-02-10 08:31:34 +00:00
SongFerngWang
16215c74a7 Add two LE audio broadcast pageId
Add DIALOG_LE_AUDIO_BROADCAST for BluetoothBroadcastDialog.java
and add LE_AUDIO_BROADCAST_FIND_BROADCAST for
BluetoothFindBroadcastsFragment.java
Bug: 228255796
Test: build pass

Change-Id: I3968604074ca1ec031ea44893b33190c45ca7f47
2023-02-09 11:20:14 +00:00
Jason Hsu
57258a3765 Merge changes I13495cad,I3a44c4c4,I15bff230,I8a492866,Ia7ffe34a
* changes:
  [Pair hearing devices] Add pair hearing device functionality
  [Pair hearing devices] Extract common behavior in BluetoothPairingDetail into Base class
  [Pair hearing devices] Add "Hearing devices" to show connected hearing devices
  [Pair hearing devices] Add "Saved devices" to show bonded but not connected hearing devices
  [Audio routing] Setup basic structure for audio routing page
2023-02-09 04:04:03 +00:00
jasonwshsu
031c5f0354 [Pair hearing devices] Add pair hearing device functionality
* Add setFilter(List<ScanFilter>) in DeviceListPreferenceFragment to enable BluetoothLeScanner

Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DeviceListPreferenceFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingDevicePairingDetailTest
Change-Id: I13495cad7260789845fad9a7e77e96b692a5cbd0
2023-02-09 10:17:25 +08:00
jasonwshsu
723c385c18 [Pair hearing devices] Extract common behavior in BluetoothPairingDetail into Base class
* Before adding new hearing device feature, we will extract the common part into Base class first. They will share most of the UI component.

Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicePairingDetailBaseTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicePairingDetailTest
Change-Id: I3a44c4c464d630fdcafa151afc82d3000fd728a3
2023-02-09 10:17:25 +08:00
jasonwshsu
23417c3aca [Pair hearing devices] Add "Hearing devices" to show connected hearing devices
Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableHearingDeviceUpdaterTest
Change-Id: I15bff230cac29fdbad13d452878bc57b57d9773e
2023-02-09 10:17:25 +08:00
jasonwshsu
c1fb0ae240 [Pair hearing devices] Add "Saved devices" to show bonded but not connected hearing devices
* BaseHearingDevicePreferenceController will also be used in "Hearing devices", so extract to parent class first.

Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(SavedHearingDeviceUpdaterTest|BaseBluetoothDevicePreferenceControllerTest|BluetoothDeviceUpdaterTest|AvailableMediaBluetoothDeviceUpdaterTest|ConnectedBluetoothDeviceUpdaterTest|SavedBluetoothDeviceUpdaterTest)"
Change-Id: I8a492866f48e3a664b9ff78bce5a4f082c0dc465
2023-02-09 10:17:25 +08:00
jasonwshsu
48d56420ce [Audio routing] Setup basic structure for audio routing page
* Setup UI and bridge device address into audio routing fragment

Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsAudioRoutingFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsAudioRoutingControllerTest
Change-Id: Ia7ffe34af54011a2e3cb445fc4fbd00f991835f3
2023-02-08 20:55:52 +08:00
Vania Januar
649c5198c8 Use BluetoothUtils.isAdvancedDetailsHeader in Header controllers.
Also removed isAdvancedDetailsHeader from Utils as it's an
exact duplicate of the function in BluetoothUtils.

Bug: 268165863
Test: AdvancedBluetoothDetailsHeaderControllerTest,
BluetoothDetailsHeaderControllerTest

Change-Id: Ia8caa7d0dce1760dcf14f2bdfcfebd81ad370f79
2023-02-07 11:34:16 +00:00
Xin Li
c660135971 Merge TQ1A.230205.002
Bug: 263898609
Merged-In: I13562d227e06627fac33239a9d21fd405a18d012
Change-Id: I1457d9362378bd893f557e1c998308cf8ee8904a
2023-02-06 21:05:31 -08:00
Betty Chang
ee7b709aff Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6 am: c985a6d47d am: fb8a7a3b55
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039

Change-Id: I3126d4c3a15ce813abb28c2bf6ce38394f5aa570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 21:59:35 +00:00
Betty Chang
c985a6d47d Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039

Change-Id: I92615d5cc7a8605458d78082b45b339234ea52e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-13 11:58:35 +00:00
changbetty
ca475a5d37 [LE Audio] To add the vibrate when the scan is successful
Bug: 242023882
Test: manual test
Change-Id: Iabff5fb81e307222fb33541e4bf0008830321d3e
2023-01-13 02:30:23 +00:00
Andy Hung
11264e9a00 Merge "Bluetooth Settings: Restore Spatial Audio Settings" 2023-01-11 03:29:14 +00:00
Jason Hsu
e0301f7aa4 Merge "[hearing devices page] Launch 'Hearing decice controls' to Accessibility hearing device page." 2023-01-10 09:05:55 +00:00
Andy Hung
65680a2fd7 Bluetooth Settings: Restore Spatial Audio Settings
No need to gate under feature flag, it only shows if
Spatial Audio exists on device.

Test: Connect BT headset and see spatial audio settings
Bug: 264709855
Change-Id: Iddda3eb430b62880036bbe8c680addca07a60ab2
2023-01-06 16:21:29 -08:00
William Escande
377d52bfc1 Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8 am: ce2edfa3d4 am: 1da99510b1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2373748

Change-Id: Ib68558e8896e5bd282eacd34f2bc2044bed5f54c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 07:37:29 +00:00
William Escande
1da99510b1 Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" am: 9aa06f28e8 am: ce2edfa3d4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2373748

Change-Id: I3346dba2aa9751bc77c17287dfe5d31759c05607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-05 07:02:43 +00:00
William Escande
9aa06f28e8 Merge "Fix NPE in BluetoothPairingController when comparing BluetoothClass" 2023-01-05 05:59:38 +00:00
Treehugger Robot
47f6d387e7 Merge "Fix comment typo in BluetoothLengthDeviceNameFilter" am: 02888676a7 am: aa723a43dd am: 2fa3b95342
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375748

Change-Id: I3df300aa4e8895ee4f3c0b8250e51b13920c1fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 12:27:50 +00:00
Treehugger Robot
2fa3b95342 Merge "Fix comment typo in BluetoothLengthDeviceNameFilter" am: 02888676a7 am: aa723a43dd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2375748

Change-Id: I7248e9b4f45a82ecaf55a451817dc5e056ba6c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-04 11:53:04 +00:00
Shen Lin
85067c8136 Fix comment typo in BluetoothLengthDeviceNameFilter
Change-Id: I222d048e683bff4473849d26de50318b51a1eb9e
Test: manual
2023-01-04 08:46:12 +00:00
Shen Lin
bdcfaceeb2 Fix NPE in BluetoothPairingController when comparing BluetoothClass
Bug: 264162859
Test: atest BluetoothPairingControllerTest
Change-Id: I7e3c913855d77983f4f8bc61f5b08f64fe9fae4d
2023-01-03 06:33:51 +00:00
Betty Chang
a50fb6ec33 Merge "To check the bond state when get the connection state" 2023-01-03 02:20:03 +00:00
Vania Januar
b837d57b02 Set title for Bluetooth Details page to "Stylus" for styluses.
Bug: 254835745
Test: BluetoothDeviceDetailsFragmentTest
Change-Id: I725877b0bcf44fa7be805e16fb2d695c9d6074dc
2022-12-29 12:31:59 +00:00
Vania Januar
57822a67a8 Pass CachedBluetoothDevice into StylusDevicesController.
Styluses can now be identified using the newly added DEVICE_TYPE_STYLUS
metadata.

Bug: 251200056
Test: StylusDevicesControllerTest
Change-Id: Ie89f6419cd16ed97299944b35497c6b2ee764dab
2022-12-29 12:31:31 +00:00
jasonwshsu
9cb33c1315 [hearing devices page] Launch 'Hearing decice controls' to Accessibility hearing device page.
Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsHearingDeviceControlsControllerTest
Change-Id: I14cdc8f91f1a6212ab98081eddd15e6a1eb5db50
2022-12-28 02:35:54 +08:00
changbetty
3caa8ad8f0 To check the bond state when get the connection state
Bug: 251973679
Test: manual test
Change-Id: I1e637bf5accbc5706f9d8a6f557a4fe038dae66b
2022-12-21 09:17:39 +00:00
jasonwshsu
a7d5801d28 [hearing devices page][Audio routing] Add feature flag to control visibility of the hearing device controls and audio output
* Setup basic xml for hearing device controls and audio output in bluetooth detail device page.
* Use same PreferenceCategory with spatial audio and rename to
  `feature_controls_group`

Bug: 237625815
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsHearingDeviceControlsControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsAudioRoutingControllerTest
Change-Id: Ibe71757b53b9d65c6ab6efa1053d035e78882b68
2022-12-20 11:05:23 +00:00
changbetty
9d2b2ca5d8 Make bluetooth switch not discoverable via SliceDeepLinkTrampoline
Bug: 244423101
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothSwitchPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDashboardFragmentTest
Test: manual test by test apk

Change-Id: I13562d227e06627fac33239a9d21fd405a18d012
(cherry picked from commit c706aa6108)
Merged-In: I13562d227e06627fac33239a9d21fd405a18d012
2022-12-14 02:25:36 +00:00
TreeHugger Robot
beee3044d8 Merge "Implement new keyboard settings UI." 2022-12-13 05:28:07 +00:00
danielwbhuang
1639782df6 Implement new keyboard settings UI.
Add enabled input method locales page
Add keyboard layout picker page
Add keyboard settings entry in BT device detail

Bug: 242680718
Test: local test
Change-Id: I07e068ecde553d394697b25cb573f806229f6f52
2022-12-13 10:47:07 +08:00