PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,470 Commits 1 Branch 0 Tags
44bd2e97ccbcbf3093e6ad0a4592d64a5cf85cef
Commit Graph

1297 Commits

Author SHA1 Message Date
Zoey Chen
5e9a00f72f [Le Audio] Use the ThemeResolver instead of setTheme() to avoid the theme res may be updated in the future and we need to update it manually. 
Bug: 238841204
Test: manual
Change-Id: I3801f23244f6f54b6147390edccf026da1f0f9c6
 2022-07-15 06:56:36 +00:00
Angela Wang
b4e3cd1e77 Merge "Update source metric category of HearingAidDialogFragment and HearingAidPairingDialogFragment" 2022-06-29 11:38:17 +00:00
Zoey Chen
2e7cb6f40f [Le Audio] Remove the redundant code 
Bug: 237375847
Test: manual
Change-Id: Ice64a61c92d87eee0981453640a1401e10d6fd83
 2022-06-29 02:03:11 +00:00
Angela Wang
c7e74fd8b6 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
 2022-06-28 03:49:34 +00:00
SongFerng Wang
48333f57cc Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f am: 0018589f09 am: 6293d2a103 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I76826b0908d8a9b307087b1bc9a4ea7d6251d6d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-26 17:41:46 +00:00
SongFerng Wang
0018589f09 Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I43380dd3e84f63925c494038f9bb1c84207f2faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-26 17:02:16 +00:00
SongFerng Wang
dc72a4a14f Merge "The UI only shows the active LE device" into tm-d1-dev 2022-06-26 16:38:24 +00:00
Oriol Prieto Gascó
95d32d678c Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I94c1735bc1da2157654340fb809b0e7f273a804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:12:29 +00:00
Oriol Prieto Gascó
f53df5fed1 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 930ccdecef 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I7731eed119f366ec0bb31eb74e75f83cdd8a0a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-22 18:12:13 +00:00
SongFerngWang
6426382e90 The UI only shows the active LE device 
At the media device, it only shows the active LE device which is
connected.

Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest

Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
 2022-06-20 21:30:34 +08:00
Oriol Prieto Gasco
f528e7de49 Use com.android.bluetooth as the BT stack APK 
Test: TH
Bug: 236187653, 236192423
Change-Id: Ia86d195780a4994607b5533420cb72bd458d4f9a
 2022-06-19 23:06:06 +00:00
TreeHugger Robot
1b5fd5904d Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 3b2fe3e89e am: 7fb0500aa8 am: f20d28e0c3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: I251634e96e47dee560b9031f2122893ec8042a72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 21:36:13 +00:00
TreeHugger Robot
7fb0500aa8 Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 3b2fe3e89e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446

Change-Id: I14e635b309b81f636043f550e01e185c4839dd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-06-10 19:58:36 +00:00
Alan Huang
b9be27b006 [VolumePanel] Fix the Hearable control slice uri parameter 
The provided uri doesn't contain the formatted string, so just append
the width at the end

Bug: 229048602
Test: make -j64 RunSettingsRoboTests
Change-Id: Idadbb4d725c8ca65bac31fbead8ac1d429ebcea9
 2022-06-09 08:22:33 +00:00
SongFerng Wang
266a0ad585 Merge "[LE unicast] Disable the "phone calls" when LE is enabled" into tm-dev am: 96bd20dca4 am: a0553c9d16 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556454

Change-Id: I97731177e18ff3aeab109656b7e639bcfa91a0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-05-23 15:07:48 +00:00
SongFerngWang
0167a4d8a6 [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
Merged-In: Ib507352107c0d825b8c7a9605713bc9083259fbd
 2022-05-23 17:34:48 +08:00
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