Commit Graph

1451 Commits

Author SHA1 Message Date
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
SongFerng Wang
9b6c604742 Merge "[LE unicast] Change the default value for LeContactSharingEnabled" am: 48967e6466 am: 3b66c18d75 am: 6296df10da
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064750

Change-Id: I2b87ec33acef3ff86422ac715a30973fa6fd837a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-15 08:42:48 +00:00
SongFerngWang
b50430e09d [LE unicast] Change the default value for LeContactSharingEnabled
Bug: 229322144
Test: build pass.
Change-Id: I7673397b9f04df8acb551bdad42dea1f3ece72ff
2022-04-15 15:19:17 +08:00
Hugh Chen
bf81ecd75f When in guest mode hide the rename button
Bug: 198173108
Test: local test
Change-Id: I29eb227104baa43ab8223f86a6a5d9cecd612bde
2022-04-14 11:21:07 +00:00
SongFerng Wang
b1166a441c Merge "Hide the Contact sharing toggle for LE audio mode" am: 3f830cc646 am: 1e89cd323e am: 028ad8fd3d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063555

Change-Id: Ibcd93e3f6610c1f1dfbfa687ba8bec390b8456b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 10:11:52 +00:00
SongFerngWang
11b337178a Hide the Contact sharing toggle for LE audio mode
1. Add the device config key
2. Hide the Contact sharing toggle for LE audio mode
Bug: 228415214
Test: manual test and take the screenshots at bug.

Change-Id: I07674d0edbcd642814ed61ccd13cb4e1e42caec3
2022-04-13 22:11:49 +08:00
Betty Chang
6ebed73fbe Merge "[LE Audio] Broadcast Sink UI" into tm-dev 2022-04-11 13:57:52 +00:00
changbetty
a56e198c61 [LE Audio] Broadcast Sink UI
- Add dialog for Broadcast and find broadcast source

 - Add Activity for find broadcast source

Bug: 228274114
Test: Manual test
Change-Id: I830efc3514fc42aaa4e53f491ed3a7459bd9bb41
2022-04-11 08:15:10 +00:00
Roopa Sattiraju
64f9d41ee3 Changing apk name in the manifest and the corresponding packages.
BUG: 226403247
Test: TH
Change-Id: I49ad1169899ffbb76ad00f7d5d02f815ace295e7
2022-03-24 10:30:03 -07:00
SongFerng Wang
08e5d43e54 Merge "[LE adudio] The condition of right location is wrong." am: 75869b5fef am: 285952a80e am: eefaf62ba7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2037423

Change-Id: I1a191387a358a40da753539284bba70d050a9bcd
2022-03-23 02:54:26 +00:00
SongFerng Wang
75869b5fef Merge "[LE adudio] The condition of right location is wrong." 2022-03-23 01:52:05 +00:00
SongFerngWang
418d78f978 [LE adudio] The condition of right location is wrong.
1. Fix the condition of right location.
2. If the location is left+right, showing the legacy battery style.

Bug: 225800014
Test: build pass. local test.
Change-Id: I03d1d7bfe26d52e0b69d24aec6bd3216350403a0
2022-03-23 02:55:06 +08:00
SongFerng Wang
cfb201c400 Merge "[LE]Gray out the a2dp and hfp when LeAudio is enabled" 2022-03-17 03:11:24 +00:00
SongFerngWang
b76eb99d4a Add the battery information into device details header
Add the new LE audio header
Add the battery information
Update the condition for non-LE audio header

Bug: 218626547
Test: build pass and manualy test
Change-Id: Ib9f4c388c369dc374c43dd399111e02b5555159b
Merged-In: Ib9f4c388c369dc374c43dd399111e02b5555159b
2022-03-16 18:00:50 +08:00
SongFerngWang
e7c89d616a [LE]Gray out the a2dp and hfp when LeAudio is enabled
1.Gray out the a2dp and hfp when le audio is enabled
2.When the user disables le audio, then the settings turn on the
  a2dp and hfp
3.When the user enables le audio, then the settings turn off the
  a2dp and hfp

Bug: 218626162
Test: build pass.
Change-Id: Ic728749112b0047cac291600b3279b9dedbf0b5a
Merged-In: Ic728749112b0047cac291600b3279b9dedbf0b5a
2022-03-16 17:51:22 +08:00
SongFerng Wang
45436a025c Merge "Add the battery information into device details header" into tm-dev 2022-03-16 09:44:42 +00:00
SongFerngWang
57dd3bc444 Add the battery information into device details header
Add the new LE audio header
Add the battery information
Update the condition for non-LE audio header

Bug: 218626547
Test: build pass and manualy test
Change-Id: Ib9f4c388c369dc374c43dd399111e02b5555159b
2022-03-16 12:17:15 +08:00
SongFerngWang
8339724c21 [LE]Gray out the a2dp and hfp when LeAudio is enabled
1.Gray out the a2dp and hfp when le audio is enabled
2.When the user disables le audio, then the settings turn on the
  a2dp and hfp
3.When the user enables le audio, then the settings turn off the
  a2dp and hfp

Bug: 218626162
Test: build pass.
Change-Id: Ic728749112b0047cac291600b3279b9dedbf0b5a
2022-03-16 00:04:59 +08:00
Hugh Chen
7b5f8ad883 RESTRICT AUTOMERGE Implement Spatial Audio and Head Tracking option in bluetooth settings
Implemented the Spatial Audio and Head Tracking options, make these
features could be controlled in bluetooth detail settings.

Bug: 218960300
Test: make -j64 RunSettingsRoboTests
Change-Id: I880cc7a10fc5e2fa5d1052fff5a7b589a4ff60df
(cherry picked from commit bc2f30ca67)
2022-03-09 11:02:34 +00:00
Hugh Chen
827910d3c3 Show prediction time when both value are ready
Bug: 215767460
Test: make -j64 RunSettingsRoboTests
Change-Id: I07947b3eca1f656e0dc603f9b9839825dd3149fd
2022-02-22 05:38:33 +00:00
Treehugger Robot
1903d00ca1 Merge "Show identity address in the bluetooth details page" am: 5d17cfd938 am: 3ac72d1fd6 am: b99cd8f159
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952171

Change-Id: I5a3ac49ead905f5b960d53a24eb9ec015a138805
2022-02-15 06:47:55 +00:00
Treehugger Robot
3ac72d1fd6 Merge "Show identity address in the bluetooth details page" am: 5d17cfd938
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1952171

Change-Id: I07ff71fbb60abae09d8a3116542260b709a6a81e
2022-02-15 06:13:57 +00:00
Treehugger Robot
5d17cfd938 Merge "Show identity address in the bluetooth details page" 2022-02-15 05:07:42 +00:00
Xin Li
da7237b2ed Merge "Merge sc-v2-dev-plus-aosp-without-vendor@8084891" into stage-aosp-master 2022-02-14 17:30:11 +00:00
William Escande
6de80163b1 Resolve bluetooth hidden API usages
Bug: 143245666
Test: build
Change-Id: Idadf84873c88155382c48bb9108cf28d88aaef0a
Merged-In: Idadf84873c88155382c48bb9108cf28d88aaef0a
2022-02-11 14:19:38 +01:00
William Escande
4a5c128624 Resolve bluetooth hidden API usages
Bug: 143245666
Test: build
Change-Id: Idadf84873c88155382c48bb9108cf28d88aaef0a
2022-02-08 15:37:56 +01:00
Chienyuan
84a9b23ba8 Show identity address in the bluetooth details page
Bug: 197044261
Test: build pass
Change-Id: Ic1ef1d575f35c4b37d6f9195ec10dd31ed5bdd5b
2022-02-08 11:29:03 +00:00
Hugh Chen
8849628106 Add connect / disconnect action when connect / disconnect to bluetooth device
Bug: 215299757
Test: build pass
Change-Id: Ib6fd592f63d4035674dc60cd54f16ffd5550ecff
2022-01-19 08:09:35 +00:00
Michael Groover
d1f76eea72 Merge "Add unaudited exported flag to exposed runtime receivers" 2022-01-03 17:35:02 +00:00
Treehugger Robot
00b405cd59 Merge "Clear non bonded device when device picker start" am: 0d0eaad0e3 am: fb9b219b9a am: 4df15611f8 am: adfd4a0dea
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1931647

Change-Id: Ida1c15efbec1b5cfd9fecf4f9abc97c7f2c0b3a2
2021-12-27 06:59:18 +00:00
Treehugger Robot
adfd4a0dea Merge "Clear non bonded device when device picker start" am: 0d0eaad0e3 am: fb9b219b9a am: 4df15611f8
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1931647

Change-Id: Ie2f98508e42dd6018744d8de169f7ea49a892ca7
2021-12-27 06:39:59 +00:00