Commit Graph

1451 Commits

Author SHA1 Message Date
SongFerng Wang
4e151185a7 Merge "[LE unicast] Using the pairDeviceByCsip API" into tm-qpr-dev am: 3767112332 am: 29caa8e0f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20176388

Change-Id: Ib1dcb8c150cb8123c5dc2475839d49f97e792c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-10-19 07:07:16 +00:00
Chaohui Wang
507e5f8c90 Fix some errors for Settings project
Attrs could not have same name, so create a common parent for the
messageText. And BiometricEnrollCheckbox is not in use.

Replace some com.android.settingslib.R with com.android.settings.R,
because these are files in settings instead of settingslib.

Bug: 253772249
Test: TAP
Change-Id: Ifa796e923bf26facf4935be4968637affdb4b48b
2022-10-16 14:14:02 +08:00
SongFerngWang
7087388a0f [LE unicast] Using the pairDeviceByCsip API
ag/20176285 changes the API flow.

Bug: 253541065
Test: make RunSettingsLibRoboTests ROBOTEST_FILTER=CachedBluetoothDeviceManagerTest
local test and result is on bug (pass)

Change-Id: I2354b464a93b3122b462dc9cc20556f621490d2a
2022-10-14 04:43:39 +00:00
Tim Peng
2a51ffb68b Merge "single component HFP device has no battery info in the Device details page" 2022-09-29 08:28:40 +00:00
timhypeng
7c4e04b187 single component HFP device has no battery info in the Device details page
-get full summary when the metadata does not contain the battery
information
-remove unexpected "test_summary" text

Bug: 237594992
Test: make -j50 RunSettingsGoogleRoboTests ROBOTEST_FILTER=AppBypassBroadcastReceiverTest

Change-Id: I3e3682cf88cdd147d4b7cd68f37f5e33f01c788d
2022-09-29 08:27:33 +00:00
SongFerng Wang
1a53831df1 Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev am: f970d63b3b am: d57eb2054b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20033811

Change-Id: I9c0d24248c6e67d9c43139fa4668fbd4fc813c77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-28 20:46:23 +00:00
SongFerng Wang
f970d63b3b Merge "Add the way for hiding the "contact sharing" on the pairing dialog" into tm-qpr-dev 2022-09-28 19:45:33 +00:00
SongFerngWang
51cabc5553 Add the way for hiding the "contact sharing" on the pairing dialog
There is the way to hide the "contact sharing" at the "device details"
page, but it did not be implemented on the pairing dialog. Add this way
on pairing dialog.

Bug: 246668278
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothPairingDialogTest

Change-Id: I472acb80e70fe5d2a59cb9eed95fcbccfa417fa5
2022-09-27 16:06:49 +08:00
jasonwshsu
35e20d5ace Fix not on the top when entering device detail page
Root Cause: Added SpacePreference in xml let the page renders order
incorrectly.

Solution: That SpacePreference should only be visible when the device is
hearing aid.

Bug: 245681095
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Merged-In: Ic0be940c8466b5e1e301255868c29d06bd4428bd
Merged-In: I442445a861898258a73f37ad8f85bcee387fbf58
Change-Id: Icca48d9c2643507638b2b581d052530521cce5df
2022-09-21 23:54:15 +08:00
Jason Hsu
a1cb4fd446 Merge "Fix not on the top when entering device detail page" 2022-09-21 14:50:32 +00:00
jasonwshsu
cfec092373 Fix not on the top when entering device detail page
Root Cause: Added SpacePreference in xml let the page renders order
incorrectly.

Solution: That SpacePreference should only be visible when the device is
hearing aid.

Bug: 245681095
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Change-Id: Ic0be940c8466b5e1e301255868c29d06bd4428bd
2022-09-21 16:00:12 +08:00
Angela Wang
4313b81f57 Merge "Logs hearing aid information when a hearing aid is bonded" into tm-qpr-dev 2022-09-17 01:00:19 +00:00
Hugh Chen
bdfd8531a9 Add Spatial audio settings for LE Audio devices
- Adds TYPE_BLE_HEADSE, TYPE_BLE_SPEAKER and TYPE_BLE_BROADCAST for
  display Le audio devices.
- Adds TYPE_HEARING_AID for display hearing aid devices.

Bug: 244528781
Test: make -j64 RunSettingsRoboTests
Change-Id: I1278a5e0c93fdc5a4873df68032128ffedfe72d6
Merged-In: I1278a5e0c93fdc5a4873df68032128ffedfe72d6
(cherry picked from commit f8704add51)
2022-09-16 15:51:15 +00:00
Jason Hsu
036833c54d Merge "Fix display wrong information "pair left/right ear" on device detail page when disconnect one of HA" 2022-09-16 09:34:39 +00:00
jasonwshsu
93f696bc99 Fix display wrong information "pair left/right ear" on device detail page when disconnect one of HA
Root Cause: Did not update device information in device detail page

Solution: Listen to device attributes change and update information in
call function refresh()

Bug: 246877392
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest
Change-Id: I442445a861898258a73f37ad8f85bcee387fbf58
2022-09-16 16:20:16 +08:00
Angela Wang
83a1af221a Logs hearing aid information when a hearing aid is bonded
The information including device mode, device side, and entry page id where the binding process starts. Set the mapped bond entry from BluetoothPairingDetail into the cached bluetooth device and log it later when the device mode and device side is received after the hearing aid bluetooth profile is connected.

Bug: 237344016
Test: m statsd_testdrive & statsd_testdrive 513

Change-Id: Ie0432f7da4f29e89e47d0ad3d72a04a9f5ea83ae
Merged-In: Ie0432f7da4f29e89e47d0ad3d72a04a9f5ea83ae
2022-09-15 22:37:42 +00:00
TreeHugger Robot
24f8f3f754 Merge "Add Spatial audio settings for LE Audio devices" 2022-09-15 14:33:38 +00:00
Angela Wang
6924029ddc Update source metric category of HearingAidDialogFragment and HearingAidPairingDialogFragment
Use different source metric categories to distinguish different launch sources of the BluetoothPairingDetail page.

Bug: 237344016
Test: manual
Change-Id: If762e87414055f3e497f99ea6885f7736b7193cd
Merged-In: If762e87414055f3e497f99ea6885f7736b7193cd
2022-09-15 06:21:43 +00:00
Hugh Chen
f8704add51 Add Spatial audio settings for LE Audio devices
- Adds TYPE_BLE_HEADSE, TYPE_BLE_SPEAKER and TYPE_BLE_BROADCAST for
  display Le audio devices.
- Adds TYPE_HEARING_AID for display hearing aid devices.

Bug: 244528781
Test: make -j64 RunSettingsRoboTests
Change-Id: I1278a5e0c93fdc5a4873df68032128ffedfe72d6
2022-09-14 12:00:45 +00:00
Angela Wang
673f40d4c8 Merge "Logs hearing aid information when a hearing aid is bonded" 2022-09-14 10:49:07 +00:00
Angela Wang
cf199c96bf Logs hearing aid information when a hearing aid is bonded
The information including device mode, device side, and entry page id where the binding process starts. Set the mapped bond entry from BluetoothPairingDetail into the cached bluetooth device and log it later when the device mode and device side is received after the hearing aid bluetooth profile is connected.

Bug: 237344016
Test: m statsd_testdrive & statsd_testdrive 513

Change-Id: Ie0432f7da4f29e89e47d0ad3d72a04a9f5ea83ae
2022-09-14 06:27:10 +00:00
SongFerngWang
bf363adbc6 Add more logs for analysis am: 4a5680ac09 am: b5dbbceecd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19888371

Change-Id: Iad8f68879d0195bc6e223772cdf8bc58c53e41bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-13 02:01:51 +00:00
SongFerngWang
4a5680ac09 Add more logs for analysis
Bug: 245657079
Test: NA. It is the log only.
Change-Id: I9909acc27ccbef48f653cfcd0cc84942c4353eac
2022-09-13 01:11:17 +00:00
Shen Lin
e960694a15 Fix compile warnings due to non-varargs call of varargs method
Bug: 245384099

Test: manual
Change-Id: Ie25c53b20cad318097ff17b7df0b4dd9ffeb4a32
Merged-In: Ib225d185b6f15463f4fae809e0cdaa25920d52af
2022-09-08 07:02:52 +00:00
Jason Hsu
2ee7ebdf61 Merge changes If6c3b2f3,I8dafefbb
* changes:
  Fix 'Hearing aids' of Accessibility page didn't display connected info promptly when mobile restart
  Fix after dis/reconnect HA, DUT will request to re-pair one side of HA
2022-09-06 08:26:37 +00:00
SongFerng Wang
17122f9617 Merge "Add owner for job handover" into tm-qpr-dev 2022-09-06 04:57:49 +00:00
jasonwshsu
88f36dccc7 Fix after dis/reconnect HA, DUT will request to re-pair one side of HA
Root Cause: Another side of HA jumps to connecting state after pair-other-ear dialog appears.

Solution: Listen to onDeviceAttributesChanged() callback to know when
the sub device gets connected, then to dismiss dialog.

Bug: 236782832
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtilsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidPairingDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaDeviceGroupControllerTest
Change-Id: I8dafefbb05e7cf1cadf37a7acbb2c5d66f2d0a78
2022-09-03 18:28:11 +08:00
SongFerngWang
76870250e8 Add owner for job handover
CP from the AOSP aosp/2200280.

Bug: 244524317
Test: NA
Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c
Merged-In: I9259596811cba08a21b78eebbe2f847e1aa6818c
2022-09-02 07:01:25 +00:00
SongFerng Wang
b46e4b0755 Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 am: 545db0361f am: ea2cff12f8 am: 954b9bafd0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: I04b81ad2487b069d3ee9c9a009fbc824d87ce5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 14:21:35 +00:00
SongFerng Wang
954b9bafd0 Merge "Add owner for job handover" am: 89418428f6 am: 55f71f5496 am: 545db0361f am: ea2cff12f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2200280

Change-Id: I83c762cdff99730bfcda9775beb69c41c70f45bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-01 13:32:14 +00:00
SongFerngWang
2d59130485 Add owner for job handover
Will CP it into AOSP later.

Bug: 244524317
Test: NA
Change-Id: I9259596811cba08a21b78eebbe2f847e1aa6818c
2022-09-01 16:09:35 +08:00
Kweku Adams
5949fccc7a Remove duplicate strings.
"Yes" and "no" were redefined many times with no clear benefit, so this
consolidates them into one definition.

Bug: 243843096
Test: Build, install, and open the Settings app
Test: atest SettingsRoboTests
Change-Id: I5f84d09f223efd478461ded93aeac82bf7b128d8
2022-08-26 00:07:08 +00:00
Betty Chang
0e5de165ca Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev am: f14071682f am: 3852ceab9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705826

Change-Id: Ie1683d5586a6534220fb5c2024b7630267b454a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-24 05:26:11 +00:00
changbetty
c918fa812b [LE Audio] Display the correct title on broadcast assistant device
Bug: 241509690
Test: manual test
Change-Id: Iaf3a54108faaa82354ca30656dd4b7a384806408
2022-08-23 03:01:42 +00:00
Jason Hsu
f21593c870 Merge "Add pair button in bluetooth details page for hearing aid device" into tm-qpr-dev 2022-08-17 02:43:47 +00:00
pingzhi wang
11081cae50 Refresh "Device details" after resuming
"HD Audio: LDAC" is still on when relaunch "Device details" from recent
apps after turning it off

Call refresh() after resuming.

Bug: 242351058
Test: 1.Long click "Bluetooth" form QS.
  2.Pair and connect with IOT supporting LDAC.
  3.Click the settings icon to the right of the connected device.
  4.Turn on "HD audio: LDAC".
  5.Click home key, make it in recent apps.
  6.Settings-> Connected devices -> Media devices -> settings icon.
  7.Turn off "HD audio: LDAC".
  8.Try to relaunch the first "Device details" screen (step 5) from recent apps.

Change-Id: I4a0c475211669f61e718f47a713a982ac58e914a
2022-08-15 12:23:08 +02:00
Betty Chang
b9abc156c8 Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev am: 9c0904acde am: 0c2a3ead2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19459987

Change-Id: I85e2d5a8589cf775ca2da2d79081eddbd9b59378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-12 02:24:02 +00:00
Betty Chang
9c0904acde Merge "[LE Audio] To fix the condition of the broadcast icon display" into tm-qpr-dev 2022-08-12 01:29:01 +00:00
changbetty
d55a7067aa [LE Audio] To fix the condition of the broadcast icon display
- The broadcast icon will be displayed when the device is connected to
   the LE Audio device.

 - The broadcast option dialog will show the "Broadcast" option when the
   media is streaming. Otherwise, it will not show.

Bug: 235923182
Test: manual test
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MediaVolumePreferenceControllerTest
Change-Id: Ib225d185b6f15463f4fae809e0cdaa25920d52af
2022-08-11 02:01:55 +00:00
Jason Hsu
0c35e164ec Merge "Add pair button in bluetooth details page for hearing aid device" 2022-08-10 10:42:35 +00:00
jasonwshsu
7880aee855 Add pair button in bluetooth details page for hearing aid device
Root Cause: Users can not connect another ear again after they cancel
the pairing dialog in Accessibility -> hearing aids entry

Solution: Add pair button in bluetooth details page for hearing aid
device

Bug: 233038449
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest

Change-Id: I6a7af1c2c2263476b040233edb072cc64a2927b0
2022-08-10 07:20:56 +00:00
jasonwshsu
b07754d178 Add pair button in bluetooth details page for hearing aid device
Root Cause: Users can not connect another ear again after they cancel
the pairing dialog in Accessibility -> hearing aids entry

Solution: Add pair button in bluetooth details page for hearing aid
device

Bug: 233038449
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=BluetoothDetailsPairOtherControllerTest

Change-Id: I6a7af1c2c2263476b040233edb072cc64a2927b0
2022-08-09 18:06:27 +08:00
Chaohui Wang
0c55354039 Merge "Clean up unused bluetooth resources" 2022-07-26 08:10:05 +00:00
Chaohui Wang
8589b41994 Clean up unused bluetooth resources
Bug: 234570979
Test: make Settings app
Change-Id: I23d5a3dc27fe5df5ba45b8593c9f2ad3d7c25cbc
2022-07-26 12:53:24 +08:00
Himanshu Rawat
884a10c84e Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 am: 7c6a004452 am: 99bbb571f3 am: 8fc819f87a am: e379ccfff2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: Iee681eb028dd51fd744c2fb4f0ac3306fea2e1fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 04:37:02 +00:00
Himanshu Rawat
e379ccfff2 Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7 am: 7c6a004452 am: 99bbb571f3 am: 8fc819f87a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: I5d5ca2f1721ec6cf53c37eb37e150acf5ef4411e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 04:11:07 +00:00
Himanshu Rawat
dc7aa0e87f Don't cancel passkey entry pairing autonomously
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.

Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"

Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
(cherry picked from commit aa1950fd80)
Merged-In: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
2022-07-26 03:15:36 +00:00
Himanshu Rawat
7c6a004452 Merge "Don't cancel passkey entry pairing autonomously" am: 059ab284e7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2159779

Change-Id: I7680942ca7ac5da3799b10306b1a3849800a1f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-26 02:17:18 +00:00
Tim Peng
d30f5d1ac5 Merge "AID_SYSTEM_USER - Main thread blocked at getConnectionSummary()" 2022-07-25 09:59:46 +00:00
timhypeng
830cb48593 AID_SYSTEM_USER - Main thread blocked at getConnectionSummary()
-move getConnectionSummary() to background thread.

Bug: 239394377
Test: atest BluetoothDevicePreferenceTest
Change-Id: I6911f53860ff48ef6a9fa5fe3007c004e6e4a331
2022-07-25 01:28:46 +00:00