Commit Graph

1281 Commits

Author SHA1 Message Date
SongFerng Wang
9782c4093c Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002 am: d28816fcc3 am: db328a03fb am: 50ca1ab7fd am: b9973caf84
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: Ie97ebf38b61e71004ed270f485f974c63b6bc7a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 13:15:07 +00:00
SongFerng Wang
b9973caf84 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002 am: d28816fcc3 am: db328a03fb am: 50ca1ab7fd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: I9958a7a658b20187f163417ac24b989ecca14e8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 12:45:07 +00:00
SongFerng Wang
db328a03fb Merge "[LE unicast] Disable the "phone calls" when LE is enabled" am: 27b4578002 am: d28816fcc3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2100870

Change-Id: I82cf7c07333fced96063ce0653d37c7b9e6f346b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-20 00:49:21 +00:00
SongFerng Wang
27b4578002 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" 2022-05-19 23:56:08 +00:00
SongFerngWang
5350643e7a [LE unicast] Disable the "phone calls" when LE is enabled
The "phone calls" uses the Headset profile, not HFP profile. The ui
uses the wrong profile. It causes the "phone calls" is always enabled
when LE is enabled.

Bug: 231511825
Test: build pass
Change-Id: Ib507352107c0d825b8c7a9605713bc9083259fbd
2022-05-19 15:14:01 +08:00
TreeHugger Robot
330aac4d2f Merge "[Le Audio] Add test case for the QrCodeScanModeActivity" into tm-qpr-dev am: ad6fc3acf5 am: 73850fc1be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18408202

Change-Id: I71e22627ea1ab4197e2d49459af87cce1502acc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-19 04:35:55 +00:00
Zoey Chen
083c13d3f0 [Le Audio] Add test case for the QrCodeScanModeActivity
Bug: 232365943
Test: atest QrCodeScanModeActivityTest
Change-Id: I38db5957ff21608134aed2e26cd9c32f14b78eb9
2022-05-18 19:26:07 +08:00
Jason Hsu
0564c9f88c Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev am: 13438e6084 am: fd94f4b0be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17291804

Change-Id: I024d5608df72e29c54092ebc69289baa6f3e8152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 10:18:51 +00:00
Jason Hsu
13438e6084 Merge "Pop up pairing another ear dialog when detecting hearing aid is a set" into tm-dev 2022-05-15 08:35:55 +00:00
jasonwshsu
00019e721f Add mechanism to add accessibility service or activity into bluetooth 'Related' category am: 02b373522a am: 99e5fe760a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17472403

Change-Id: I2674a27be6bade64b028fdd2f1cc9118ed544c85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-15 07:48:50 +00:00
jasonwshsu
acd3f94fde Pop up pairing another ear dialog when detecting hearing aid is a set
* Pop up dialog in 'Connected deivce' page and 'Accessibility -> Hearing
  aids' page

Bug: 225117454
Bug: 226511985
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidPairingDialogFragmentTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaDeviceGroupControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidUtils

Change-Id: I34a1e3ac680a7efe97dc501bfbe93f840ad16364
2022-05-14 22:16:22 +00:00
jasonwshsu
02b373522a Add mechanism to add accessibility service or activity into bluetooth 'Related' category
Bug: 225117933
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsRelatedToolsControllerTest
Change-Id: Iaa3593b4fd9d916fe7f96b3e4bb0965fdbbe36ec
2022-05-14 22:43:19 +08:00
Jason Hsu
32fd161d70 Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709b9 am: 76155f90db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17321711

Change-Id: I11fe74d8690cfd79c2deed72385b197834cf167a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:14:08 +00:00
jasonwshsu
1c85978c9f Header for hearing aids now listed in one summary am: 82ce1d19de am: d5d0ee0cc7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17180630

Change-Id: I760bb38ab1b1afcdd51c883ff2a4b4848fe96056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 01:14:02 +00:00
jasonwshsu
d5d0ee0cc7 Header for hearing aids now listed in one summary am: 82ce1d19de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17180630

Change-Id: I172173f17adda49ddcfa38fcc75ede658d742ffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-14 00:57:42 +00:00
Jason Hsu
c3bbb709b9 Merge changes from topic "hearingAidsInT" into tm-dev
* changes:
  Add 'Live Caption' preference for hearing aids device in Device details page
  Update summary in Accessibility -> Hearing aids
  Header for hearing aids now listed in one summary
2022-05-14 00:24:44 +00:00
jasonwshsu
384200a337 Add 'Live Caption' preference for hearing aids device in Device details page
Bug: 225117933
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsRelatedToolsControllerTest
Change-Id: Ic607fa7d10aa2049ab0852a86a57dd1d5d1ac7df
2022-05-14 03:36:01 +08:00
TreeHugger Robot
1d616fcda3 Merge "Add Hearable control slice in bluetooth device detail settings" into tm-dev am: 8a823a2c2c am: 7f3fe5f386
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350203

Change-Id: I8e320da7c241b3c6f7def874f8d463771762656e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 15:53:30 +00:00
TreeHugger Robot
8a823a2c2c Merge "Add Hearable control slice in bluetooth device detail settings" into tm-dev 2022-05-13 15:34:48 +00:00
SongFerng Wang
812bd83940 Merge "[LE broadcase sink] The LE device's isGroupOp is true" into tm-dev am: 8492dbb081 am: e0689d0fac
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18349647

Change-Id: Icb679473b6f5cc0a548fcdf798a2076e79f87227
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 14:35:57 +00:00
SongFerng Wang
8492dbb081 Merge "[LE broadcase sink] The LE device's isGroupOp is true" into tm-dev 2022-05-13 13:56:47 +00:00
Zoey Chen
f3f145f202 Merge "[Le Audio] Move BT QR code scanner from Settingslibs to Settings" into tm-dev am: 8045522453 am: cd6715a06e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18332085

Change-Id: I2c5db50f50a06b1ba73deacb4779cf55ebacd588
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 10:46:01 +00:00
Zoey Chen
8045522453 Merge "[Le Audio] Move BT QR code scanner from Settingslibs to Settings" into tm-dev 2022-05-13 10:27:42 +00:00
SongFerng Wang
ef41680cd9 Merge "[BT LE broadcast sink] Initialize the sourceId" into tm-dev am: eb254aa0c3 am: db95dc7cae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18350763

Change-Id: I494532cf01dceb83c481cb748514dab782d0f0dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-13 10:26:02 +00:00
SongFerngWang
5f168b333a [LE broadcase sink] The LE device's isGroupOp is true
Bug: 228259065
Test: build pass
Change-Id: Ibaa8d9c8374c263fe1f2a345db1b3254ba396f02
2022-05-13 17:57:19 +08:00
SongFerng Wang
eb254aa0c3 Merge "[BT LE broadcast sink] Initialize the sourceId" into tm-dev 2022-05-13 06:03:39 +00:00
Alan Huang
8595cf779a Add Hearable control slice in bluetooth device detail settings
Bug: 229048602
Test: make -j64 RunSettingsRoboTests
Change-Id: I850aaee9bf7518c9f9de065fbbd1eb4919fc62ee
2022-05-13 03:41:32 +00:00
SongFerngWang
18965897bf [BT LE broadcast sink] Initialize the sourceId
If the sink device has connected the broadcast source, then the device
should initialize the sourceId and create the sourceId's preference UI.

Bug: 231576575
Test: manually test
Change-Id: I24d9e6d4c78dc4e583c5253e552456a68b1114c3
2022-05-13 09:54:20 +08:00
Zoey Chen
4b345980c3 [Le Audio] Move BT QR code scanner from Settingslibs to Settings
Systemui memory regression, so we have to move the qr code activity back to Settings

Bug: 228031398
Test: manual
Change-Id: Ic30291e6d752c6c770c40e1329d9f95ceec8cca6
2022-05-12 15:23:22 +00:00
Qasim Javed
57b50437d7 Merge "Only cancel bonding if pair button is not pressed" into tm-dev am: 94a97b6c59 am: 892e32c369
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18285591

Change-Id: Id392cf0574830d131fdce1e05a7091b1d999bac5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 01:52:15 +00:00
TreeHugger Robot
db0fae9678 Merge "Cancel bonding upon back gesture." into tm-dev am: 3dcb2b65f7 am: cf6dbff356
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18236995

Change-Id: I587d89c1fe01d736835a508f4bedc320ec845ec0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-10 21:13:03 +00:00
Qasim Javed
29b7f1d5fa Only cancel bonding if pair button is not pressed
aosp/2093046 cancels bonding unconditionally in onDestroy(), this
results in the user not being able to pair when the pair button is
pressed because onDestroy() is also called in that case.

Only cancel bonding if the user did not press the pair button.

Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
and is also able to pair when the pair button is pressed

Change-Id: I868af9b795f1bb0766656e4619bd06dc8028008a
Merged-In: I868af9b795f1bb0766656e4619bd06dc8028008a
2022-05-10 12:03:33 -07:00
Qasim Javed
419b7fa289 Only cancel bonding if pair button is not pressed
aosp/2093046 cancels bonding unconditionally in onDestroy(), this
results in the user not being able to pair when the pair button is
pressed because onDestroy() is also called in that case.

Only cancel bonding if the user did not press the pair button.

Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog
and is also able to pair when the pair button is pressed

Change-Id: I868af9b795f1bb0766656e4619bd06dc8028008a
2022-05-10 11:29:28 -07:00
Qasim Javed
78765b0b26 Cancel bonding upon back gesture.
When pairing dialog is dismissed using the back gesture, we do not call
cancelBondProcess() for the remote device. Since bonding is not
cancelled and the dialog is dismissed, when the user tries to pair again
and scans for devices, nothing shows up. This is because in case of a
pending bond or pending SDP, the request to search for new devices is
queued.

The correct behavior is to cancel bonding if the pairing dialog is
dismissed using the back gesture. This is similar to what
happens when the pairing dialog is dismissed using the cancel button.

Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog

Change-Id: Ia790e345be811be1b60762ff819544d03c5a18fd
Merged-In: Ia790e345be811be1b60762ff819544d03c5a18fd
2022-05-09 13:55:52 -07:00
Qasim Javed
0521856683 Cancel bonding upon back gesture.
When pairing dialog is dismissed using the back gesture, we do not call
cancelBondProcess() for the remote device. Since bonding is not
cancelled and the dialog is dismissed, when the user tries to pair again
and scans for devices, nothing shows up. This is because in case of a
pending bond or pending SDP, the request to search for new devices is
queued.

The correct behavior is to cancel bonding if the pairing dialog is
dismissed using the back gesture. This is similar to what
happens when the pairing dialog is dismissed using the cancel button.

Bug: 231554812
Test: Changed settings app is able to scan after dismissing the dialog

Change-Id: Ia790e345be811be1b60762ff819544d03c5a18fd
2022-05-09 13:11:13 -07:00
jasonwshsu
82ce1d19de Header for hearing aids now listed in one summary
Root Cause: Change design in Android T to show left-side and right-side
in one summary line.

Bug: 224323976
Test: manual test
Change-Id: Ia43b491d571787d356240593b221d6fe8dd1453c
2022-05-09 20:22:51 +08:00
SongFerng Wang
04a07f00e1 Merge "[BT Broadcast Sink] Add the function for leave and scan QRcode buttons" into tm-dev am: 286682ec8a am: 5d06bbc5b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18181646

Change-Id: I6c594f01cd0cfeda6c44c38489be55d492fb41bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-06 11:37:54 +00:00
SongFerng Wang
acf4b251c9 Merge "[LE broadcast sink] Add the source list in boradcast sink UI." into tm-dev am: afe6d302e4 am: e00cbc7885 am: 6e60b53542 am: da313f5e1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18131624

Change-Id: Ide3b9a7b6e9fec75ac414a6b2398532d3951cc4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-05 10:35:24 +00:00
SongFerngWang
e8bb9c9be3 [BT Broadcast Sink] Add the function for leave and scan QRcode buttons
Add function for 'leave broadcast' button
Add function for 'Scan QR code' button
Set 'level broadcast' button gray out when device does not have broadcast source

Bug: 228259065
Test: build pass and manually test
Change-Id: Iab4a45e73f49c3f755b95ea3fa38872daac7e745
2022-05-05 18:16:44 +08:00
SongFerngWang
1709c80eff [LE broadcast sink] Add the source list in boradcast sink UI.
Add the source list in boradcast sink UI.
Add the password dialog.

hsv link1: https://hsv.googleplex.com/6256032201310208
hsv link2: https://hsv.googleplex.com/5934966820044800
hsv link3: https://hsv.googleplex.com/6238095344140288
Bug: 228258236
Test: manual test

Change-Id: I698c2f7aba9baa9f143a98629b8796eda57fb379
2022-05-05 06:00:45 +00:00
Chaohui Wang
c7cb0f3efd Merge "Fix a11y label for LE Audio Battery" into tm-dev am: 22cda47705 am: 5f99fad806 am: 58b70b17f7 am: 705c447e92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18090791

Change-Id: I58541a70feba06194872cd61928993428699e2df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04 11:06:22 +00:00
Chaohui Wang
ca4920090f Fix a11y label for LE Audio Battery
Before fix, "Left" & "Right" are in the same LinearLayout, not grouped
with battery info.

After fix, "Left" & "100% battery" are grouped together.

Bug: 229042138
Test: manual test when Talkback enabled
Change-Id: Ieb35ef992f62040f14ed878515d63f6edb2559f6
2022-05-04 14:17:26 +08:00
Betty Chang
84c8069c73 Merge "[LE] Launch the dialog for the user to broadcast or find broadcast" into tm-dev am: 5dea2176a2 am: 79949be124
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18030886

Change-Id: I36fa66e0c5f0b04b3a1977bc692f1c5c97670ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 08:14:55 +00:00
changbetty
f31b5769d7 [LE] Launch the dialog for the user to broadcast or find broadcast
- Launch the broadcast dialog from entry point in Media Volume Slice

    - Fix the broadcast dialog to follow the dialog style

    - Start broadcast and launch the MediaOutputBroadcastDialog from
      broadcast dialog

Bug: 229577518
Test: manual test
Change-Id: I1329b3f35b03afc441142494df883ae17f373656
2022-05-03 03:16:08 +00:00
Hugh Chen
0c128aca74 Merge "Fix NPE in Bluetooth Settings." into tm-dev am: ec5aa12cec am: 681d69b2b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944602

Change-Id: I72fc05a7068125f4c6b68ab27b3a1532ef5f61c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 18:50:51 +00:00
Ben Murdoch
cab2b2c4d0 Fix NPE in Bluetooth Settings.
Bug: 230347816
Test: Manual
Change-Id: I210ce81217466897c59509a31fb53d57eed71118
2022-04-25 18:40:54 +00:00
TreeHugger Robot
747e75a53a Merge "Check null BT profile to prevent crash" into tm-dev am: f792528a8f am: 7906685ce3 am: b52b7e797a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17822265

Change-Id: Iad90429168b95b1f972fb85e7cfb0cfb3f7469b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:03:24 +00:00
Hugh Chen
76e230918f Check null BT profile to prevent crash
Bug: 229802811
Test: build pass
Change-Id: Idf9f32ec08793784fbce05d34c53cdf53cddb312
2022-04-20 04:53:23 +00:00
SongFerng Wang
1928926c66 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da am: 9b6c604742 am: 3f701d6924
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: If92c47e6bbf93652ff43cb4102946146bc36bdcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 09:41:25 +00:00
TreeHugger Robot
c6e4554848 Merge "When in guest mode hide the rename button" 2022-04-15 09:07:20 +00:00