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
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
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
Chienyuan
c5b8ae80ea
Clear non bonded device when device picker start
...
Bug: 205258325
Test: manual
Change-Id: I3de46ef79bcf1f643e5cd762b95ad8056237e2c6
2021-12-24 17:42:54 +08:00
Treehugger Robot
96d33dbdbe
Merge "Minor clean-up for LE audio setting" am: e41d1b9761
am: ad041d78ee
am: 7e7b1f720e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790
Change-Id: I61f187c004e20dc3865764269051b33a09af3ac2
2021-11-29 04:44:02 +00:00
Treehugger Robot
ad041d78ee
Merge "Minor clean-up for LE audio setting" am: e41d1b9761
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1904790
Change-Id: Icc8ed52e3eeaa0aefe4ccc0e65440e58cb0faedd
2021-11-29 03:58:28 +00:00
Treehugger Robot
afa860da18
Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83
am: 0a69b346c8
am: ff1ebb31d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835
Change-Id: I8273612ded6c7f489baec255a8872e5ebb301741
2021-11-29 03:04:16 +00:00
Alice Kuo
2d0025761b
Handle csip set member automatic pair in Setting am: 629611a43e
am: eb412a0614
am: 6097f9b830
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834
Change-Id: Icace2cf11100209eaa945971704b3319e9628e75
2021-11-29 03:04:15 +00:00
Alice Kuo
3d17582b0b
Do not update the previously connected devices for the sub device am: c78fb83aee
am: f6f0126b8e
am: 1da3264140
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833
Change-Id: I4e83de75cd61c7f3fcf418bfdefc79d655c063f9
2021-11-29 03:04:13 +00:00
Alice Kuo
31e82a325c
Accept the pairing request automatically for the set member pairing am: 61460a1ab1
am: 6aa53808f3
am: c932678888
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832
Change-Id: I205a7824d84a42128be5be2e77974689510d190a
2021-11-29 03:04:12 +00:00
Alice Kuo
2240418de8
Show the multiple Mac address for the coordinated set am: 9f11a4cddf
am: f0b73dade7
am: e3680e211a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831
Change-Id: I126e164160dae141978a59b02cea9f0091b7265f
2021-11-29 03:04:10 +00:00
Alice Kuo
6943c0356c
Add the pairing string for CSIP supported device am: f57f720c38
am: 5d1aee76c2
am: 2135db2eac
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830
Change-Id: I000242e2e51627507bb49e7f6f51d8a5602de493
2021-11-29 03:04:07 +00:00
Treehugger Robot
0a69b346c8
Merge changes I094ba6be,Idbdd21a1,I03dfdc25,I40afabb0,I01e0ec91, ... am: 8f91ac3e83
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903835
Change-Id: I1e70974396efc1eaf4e389cc35a2789849e696af
2021-11-29 02:29:32 +00:00
Alice Kuo
eb412a0614
Handle csip set member automatic pair in Setting am: 629611a43e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903834
Change-Id: If9172095a2688a0fbe588ccbae96076e9cf8b133
2021-11-29 02:29:32 +00:00
Alice Kuo
f6f0126b8e
Do not update the previously connected devices for the sub device am: c78fb83aee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903833
Change-Id: I3c062b23b8772496cb149ad1eff8483836a79289
2021-11-29 02:29:31 +00:00
Alice Kuo
6aa53808f3
Accept the pairing request automatically for the set member pairing am: 61460a1ab1
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903832
Change-Id: I2cce585de893512005af7abf35f5729351512cea
2021-11-29 02:29:30 +00:00
Alice Kuo
f0b73dade7
Show the multiple Mac address for the coordinated set am: 9f11a4cddf
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903831
Change-Id: I9a8a0fe9d95a4ff4adc0599ce4c9a35501968f71
2021-11-29 02:29:29 +00:00
Alice Kuo
5d1aee76c2
Add the pairing string for CSIP supported device am: f57f720c38
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1903830
Change-Id: I809634c657558da125e72bb1fcbddaf3db46a093
2021-11-29 02:29:27 +00:00
Alice Kuo
0d964f7633
Minor clean-up for LE audio setting
...
Bug: 178981521
Test: build pass
Change-Id: Ica8bd68bea494ee72fa53fbb8f9101dc535470b6
2021-11-29 10:18:47 +08:00
Alice Kuo
3487843496
Update the LE audio device into the media device category
...
Bug: 178981521
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdater
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdater
Change-Id: I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8
Merged-In: I094ba6beb66fdebd7f3ef0a7c12bbed0e5b870e8
2021-11-26 14:02:07 +08:00
Alice Kuo
629611a43e
Handle csip set member automatic pair in Setting
...
Move the set member handle to setting. SystemUI and Setting have the
individual settingLib instance. If we trigger pairing inside settingLib,
the action would be called twice. SystemUI does not contain the concept
to handle the pair interaction. Setting would take the action to
createBond for CSIP automatically.
Bug: 201758444
Bug: 150670922
Test: Pair the coordinated set devices, and check the set member pairing
would be done automatically without the pairing dialog
Change-Id: Idbdd21a1f15b04cc91cbc2d30a5cb4e9b24174b9
Merged-In: Idbdd21a1f15b04cc91cbc2d30a5cb4e9b24174b9
2021-11-26 13:53:46 +08:00
Alice Kuo
c78fb83aee
Do not update the previously connected devices for the sub device
...
As bluetooth turn on, and device reboot, UI will show the sub device
entry for hearing aid device or csip device. Check if the device is a sub device, do not update the cachedDevice information.
Bug: 150670922
Bug: 178981521
Test: bonded with a coordinated set. Check the UI only have one entry as Bluetooth turn on and device reboot.
Change-Id: I03dfdc25b57e614194fb8de2c9265edd50760d30
Merged-In: I03dfdc25b57e614194fb8de2c9265edd50760d30
2021-11-26 13:34:12 +08:00
Alice Kuo
61460a1ab1
Accept the pairing request automatically for the set member pairing
...
Check the pairing request from which device that if it's the outgoing
set member pairing, accept the pairing request automatically to make the
CSIP pairing seamless.
Bug: 178981521
Bug: 150670922
Test: Pair one of the CSIP device, and confirm the other set member can
paired without the confirmation from user
Change-Id: I40afabb09b4cb12a0253035452c9f6974799ed05
Merged-In: I40afabb09b4cb12a0253035452c9f6974799ed05
2021-11-26 13:22:15 +08:00
Alice Kuo
9f11a4cddf
Show the multiple Mac address for the coordinated set
...
Show the mac address for all the devices if the device detail combine
with the multiple connections based on CSIP.
Screenshot: https://screenshot.googleplex.com/qQjc2pxNTr3tMUV
Bug: 178981521
Test: pair with the coordinated set, and check the UI
Change-Id: I01e0ec91e5c856481318d6435d174b5a2018d820
Merged-In: I01e0ec91e5c856481318d6435d174b5a2018d820
2021-11-26 13:21:48 +08:00
Alice Kuo
f57f720c38
Add the pairing string for CSIP supported device
...
Show the pairing dialog with the hint message
that pairing this device will pair all of the
set member of a coordinated set. If the device
supports CSIP, the message will be shown.
Screenshot: https://screenshot.googleplex.com/8WcrdgBoLRgJjHs
Bug: 178981521
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BlueotohPairingDialog
Change-Id: I5432b7264652dd4485e2669f6004caa4f7459238
Merged-In: I5432b7264652dd4485e2669f6004caa4f7459238
2021-11-26 13:13:25 +08:00
TreeHugger Robot
0d252521dd
Merge "Fix phone shows incorrect pairing code in pairing dialog" into sc-v2-dev am: 3f5d3cc0f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16183665
Change-Id: If4876e9ebcfc670202d73a03d96a4632850546f4
2021-11-08 07:49:39 +00:00
TreeHugger Robot
3f5d3cc0f3
Merge "Fix phone shows incorrect pairing code in pairing dialog" into sc-v2-dev
2021-11-08 07:34:32 +00:00
Hugh Chen
13375e5f44
Fix phone shows incorrect pairing code in pairing dialog
...
Add PendingIntent.FLAG_UPDATE_CURRENT to let peding intent can
be updated the intent extra.
Bug: 204133175
Test: make -j64 RunSettingsRoboTests
Change-Id: I42966432dacc3727d31231d10aa07b782bb1d92e
2021-11-05 09:22:13 +00:00
TreeHugger Robot
ac476ff63b
Merge "Remove the text for untethered bt device" into sc-v2-dev am: 8118b9ff29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170316
Change-Id: I89ae3ac6b59ff776e745c5885f03ff529f9c7677
2021-11-04 04:25:46 +00:00
TreeHugger Robot
8118b9ff29
Merge "Remove the text for untethered bt device" into sc-v2-dev
2021-11-04 04:08:45 +00:00
Hugh Chen
ab3a70cf1e
Remove the text for untethered bt device
...
Bug: 204066796
Test: make -j64 RunSettingsRoboTests
Change-Id: I35fec4ff998332e6937fc9c360ea488b35b477f8
2021-11-04 02:52:37 +00:00
Jason Chiu
026b1b5df6
Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654
Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
2021-11-02 02:28:16 +00:00
Jason Chiu
2989c50a23
Add highlight menu keys for all toggle pref controllers and custom slices
...
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
2021-11-01 15:00:18 +08:00
Chienyuan
f06def46f7
RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth" am: 1b9a21ffb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16048451
Change-Id: I7a693b6644e200a7aa66f09704e39c178aa2baa7
2021-10-21 15:18:13 +00:00
Chienyuan
1b9a21ffb5
RESTRICT AUTOMERGE Remove connection preferences "Files received via Bluetooth"
...
Bug: 197609370
Bug: 201630499
Test: manual
Change-Id: I597a2105ca851dd41d92109f7b1a5d0137942601
(cherry picked from commit 5be9255ddf
)
2021-10-14 08:47:16 +00:00
Xin Li
8aa74d1ad4
Merge SP1A.210812.016
...
Merged-In: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
Change-Id: Ib853137811901796f73e4d720accb3249a7db963
2021-09-28 19:39:58 +00:00
TreeHugger Robot
b05bffeb71
Merge "Log when DEBUG is on" into sc-qpr1-dev am: 736bce563e
am: 2cb6e12f11
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15598813
Change-Id: Ia3d1839519b3135a4ef29405226bc9eebc961719
2021-08-31 22:41:11 +00:00
TreeHugger Robot
0164a3a724
Merge "Log when DEBUG is on" into sc-qpr1-dev am: 736bce563e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15598813
Change-Id: I527bfca7a4397af216b2abd2b04ab157d1ad1adf
2021-08-31 22:40:47 +00:00
TreeHugger Robot
736bce563e
Merge "Log when DEBUG is on" into sc-qpr1-dev
2021-08-31 22:19:19 +00:00
Guojing Yuan
cfbf0b0336
Remove CDM entries in Connected Device.
...
BUG: 191992001
Test: Robotest
Change-Id: Ie9cea79f825b78495b1f93527f3fa980f9b975e3
(cherry picked from commit 11655705db
)
2021-08-19 03:21:50 +00:00
Neha Jain
92171172ec
Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
am: bc0cf0d87f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674
Change-Id: I575d9f32e028249f49360b37dacfab9df9404e7f
2021-08-18 18:12:40 +00:00
Neha Jain
abd0f6a5f6
Merge "Remove CDM entries in Connected Device." into sc-dev
2021-08-18 18:01:00 +00:00
Hansong Zhang
13f41075d4
Log when DEBUG is on
...
Bug: 181588752
Test: manual
Change-Id: I43331ad011c9667d05ca752f523bc65883977c3c
2021-08-17 12:27:50 -07:00
Xin Li
42be0d2f75
Merge sc-dev-plus-aosp-without-vendor@7634622
...
Merged-In: Id2a8c43f9bca79200f837759ce9de0a6eba2a37a
Change-Id: I90fe22409ec7832714c8530f54408db747bdf3c4
2021-08-14 06:30:57 +00:00
Treehugger Robot
f5ddc8ffaa
Merge "Add owner to the connected device folder" am: 6cbb4dfbe1
am: 004f5168d4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1793371
Change-Id: Ic41c5d666d0740dc8a6f4bdbb9e644ad981adee1
2021-08-12 04:54:18 +00:00
Treehugger Robot
6cbb4dfbe1
Merge "Add owner to the connected device folder"
2021-08-12 04:23:29 +00:00
Hugh Chen
ddf63eac87
Add owner to the connected device folder
...
Bug: 196287361
Test: local test
Change-Id: Ib800955f04bbd6c23b9a1700faa918f8b1126d79
2021-08-12 11:16:18 +08:00