Commit Graph

576 Commits

Author SHA1 Message Date
Angela Wang
7dfbf6c92e Merge "[Ambient Volume] Migrate to use AmbientVolumeUiController in SettingsLib" into main 2024-12-18 17:52:47 -08:00
Angela Wang
fb1efa69ac Merge changes from topics "ha-aics", "ha-aics-mute", "ha-local-data" into main
* changes:
  [Ambient Volume] Ambient volume icon
  [Ambient Volume] Show value with remote data
  [Ambient Volume] Show value with local data
  [Ambient Volume] UI of volume sliders in Settings
2024-12-17 01:17:38 -08:00
Angela Wang
fc79e74955 [Ambient Volume] Migrate to use AmbientVolumeUiController in SettingsLib
Moove the common ui logic code into settingslib for using in both
settings and systemui.

Flag: com.android.settingslib.flags.hearing_devices_ambient_volume_control
Bug: 357878944
Test: atest AmbientVolumePreferenceTest
Test: atest BluetoothDetailsAmbientVolumePreferenceControllerTest
Change-Id: I97d5ac2d1862fed7249af8b35f04fa36fc47d16d
2024-12-17 06:47:01 +00:00
Angela Wang
0724f2a811 [Ambient Volume] Ambient volume icon
1. Click on the icon on the header will mute/unmute the remote devices in the same set if the remote devices are both mutable.
2. Show different icon when the value of the volume slide bars changed.

Flag: com.android.settingslib.flags.hearing_devices_ambient_volume_control
Bug: 357878944
Test: atest AmbientVolumePreferenceTest
Test: atest BluetoothDetailsAmbientVolumePreferenceControllerTest
Change-Id: I829c5e08f1456c8ef9936d0314045dc8da37cd95
2024-12-17 06:46:59 +00:00
Angela Wang
46537a6576 [Ambient Volume] Show value with remote data
Sync local data with remote data when UI need to refresh and set the
corresponding local value to remote when the control expanded/collapsed.

Flag: com.android.settingslib.flags.hearing_devices_ambient_volume_control
Bug: 357878944
Test: atest BluetoothDetailsAmbientVolumePreferenceControllerTest
Change-Id: If748e696eb62b199d4fd9abafa2300d301a8079c
2024-12-16 15:26:26 +00:00
Angela Wang
c2ca7dadd9 [Ambient Volume] Show value with local data
Flag: com.android.settingslib.flags.hearing_devices_ambient_volume_control
Bug: 357878944
Test: atest BluetoothDetailsAmbientVolumePreferenceControllerTest
Change-Id: I3dad0f5424b44fee6d049fd778c4f8f71db0b58e
2024-12-16 15:24:20 +00:00
Angela Wang
0595aed386 [Ambient Volume] UI of volume sliders in Settings
Collapse/expand the controls when clicking on the hearder with arrow.

Flag: com.android.settingslib.flags.hearing_devices_ambient_volume_control
Bug: 357878944
Test: atest AmbientVolumePreferenceTest
Test: atest BluetoothDetailsAmbientVolumePreferenceControllerTest
Test: atest BluetoothDetailsHearingDeviceControllerTest

Change-Id: I845a4397601e563ed027d7d2a0a13651e95de708
2024-12-16 15:24:19 +00:00
Yiyi Shen
17018dd7e1 Avoid AudioManager#getMode in isFilterMatched
AudioManager#getMode is a slow binder call which should not be called on
UI thread. isFilterMatched will be frequently triggered on UI thread when updating the
Connected devices page.

Cache and update the audio mode when receive onModeChanged callback in
this change. For long term, we should better separate the UI/background
thread tasks in those classes. Also send request to Audio team to
improve the API latency.

Flag: EXEMPT small fix
Bug: 380993178
Test: atest
Change-Id: I054f3fa62f0fdf03b9a436a532ac1fb4738aaf58
2024-12-12 15:25:34 +08:00
Yiyi Shen
c9c088ae34 [Audiosharing] Check profile readiness before adding source
Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Bug: 362858921
Change-Id: I9ee6226d1bd16225adf1756678ef7565941d7c60
2024-12-10 17:01:09 +08:00
Haijie Hong
67ac0faf3d Add loading screen for Device details fragment to avoid ANR
BUG: 343317785
Test: local tested
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Iad57fc2fe4cb0a3f90e8d01310b9c7ad20d02233
2024-11-29 22:04:31 +08:00
Evan Chen
79e1918413 Merge "Add deviceId in AssociaitonInfo" into main 2024-11-27 21:06:08 +00:00
Haijie Hong
fb9d83ad68 Add metrics for new bluetooth device details
BUG: 343317785
Test: atest DeviceDetailsFragmentFormatterTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Ic74a885627a1426c338b093dcf949688fe9784d1
2024-11-14 15:34:55 +08:00
Haijie Hong
aaa040e085 Revert ANC and Spatial audio UI change
BUG: 378016708
Test: atest DeviceDetailsFragmentFormatterTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I390ff06ab11b16134d0656c9576670b319c46c74
2024-11-11 12:41:33 +08:00
Haijie Hong
77132f0e61 Merge "Remove extra space around profiles and audio category" into main 2024-10-30 08:13:38 +00:00
Haijie Hong
2c9e4d373e Remove extra space around profiles and audio category
BUG: 376021212
Test: local test
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: If3e18ce26c688087158542e28e4981cf821fa2b8
2024-10-30 05:31:55 +00:00
Yiyi Shen
fba28fab5c Merge "[Audiosharing] Fix tests for hysteresis mode" into main 2024-10-29 05:01:12 +00:00
Yiyi Shen
ece6ca317c [Audiosharing] Fix tests for hysteresis mode
Bug: 375975222
Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Change-Id: I8b16d7bc32ad825d152c1092cff447bb950803aa
2024-10-28 19:21:59 +08:00
Haijie Hong
6f9a18ec68 Hide spatial audio toggle when disconnected
BUG: 375546672
Test: atest SpatialAudioInteractorTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I524174e6ef66b5d1ef90ac171c66f05aa7e26b53
2024-10-28 15:51:11 +08:00
Haijie Hong
7764a3e5af Fix coroutine scope expired and UI animation issue
BUG: 375365790
BUG: 375146578
BUG: 375304695
BUG: 375544752
Test: atest BluetoothDeviceDetailsViewModelTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Ib3bc6699f256288b6c4995b78cc25a16f1af0792
2024-10-28 03:16:26 +00:00
Evan Chen
66d518d666 Add deviceId in AssociaitonInfo
Test: cts
Bug: 330793944
Flag: EXEMPT trivial bugfix
Change-Id: Ib6860f8950f022689ae0c9ef6b4b6794e727c8f9
2024-10-10 00:00:26 +00:00
Evan Chen
10175bf1ce Merge "Update AssociationInfo with deviceIcon field" into main 2024-10-09 05:42:30 +00:00
Yiyi Shen
d375984779 Merge "[Audiosharing] Use DialogFragment instead of raw AlertDialog" into main 2024-09-26 02:49:38 +00:00
Yiyi Shen
54b0d18a04 [Audiosharing] Use DialogFragment instead of raw AlertDialog
FragmentManager can help manage the state of the dialog and automatically restore the dialog when a configuration change occurs

Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Bug: 362858921
Change-Id: If63c7891cfb92e06c457e37eb5556f3eaf3f6121
2024-09-25 17:31:14 +08:00
Haijie Hong
7e7530bfd1 Merge "Fix two-panel issue in tablet" into main 2024-09-25 07:36:43 +00:00
Haijie Hong
1020e7132d Fix two-panel issue in tablet
Keep the logic same as BlockingPrefWithSliceController.

BUG: 343317785
Test: atest BluetoothDeviceDetailsViewModelTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I77e62479def433869ae5e93987ec7069cc61173a
2024-09-25 13:48:33 +08:00
Yiyi Shen
5ea28f5f0a [Audiosharing] Apply new string resid
Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Bug: 362858921
Bug: 362858894
Change-Id: I4c80d834515e43bade5f2207dc013dc30c6ab7be
2024-09-23 18:56:04 +08:00
Yiyi Shen
133fcf3dc5 Merge "[Audiosharing] Refine share then pair flow" into main 2024-09-19 13:29:37 +00:00
Yiyi Shen
800f81c832 [Audiosharing] Refine share then pair flow
Currently when there is one active LEA headset and users toggle on the audio sharing, a dialog will pop up to ask users to pair new headset and share audio with it. After user click pair new device button on the dialog:

1. Route users to pair new device page.
2. If users pair an LEA headset, finish the pair new device page and
   auto add source to the headset with loading indicators on audio
   sharing page.
3. If users pair a classic headset, wait for timeout, pop up dialog
   saying the paired headset is not compatible for audio sharing and
   finish the pair new device page.

Test: atest
Flag: com.android.settingslib.flags.enable_le_audio_sharing
Bug: 331892035
Change-Id: Ifb9579db0ef57d3a379cb5d17c66a604d1396bb4
2024-09-19 14:03:48 +08:00
Evan Chen
e3e348b2dc Update AssociationInfo with deviceIcon field
Test: CTS
Bug: 341057668
Flag:  EXEMPT bugfix

Change-Id: I1398f4a225bf84ccb80438e0ce5f04f2ee844f27
2024-09-17 18:22:29 +00:00
Haijie Hong
237264fe56 Merge "Show highlight for device setting items" into main 2024-09-13 08:58:44 +00:00
Haijie Hong
fb18978718 Fix tests after device rename button is moved
BUG: 343317785
Test: atest BluetoothDeviceDetailsFragmentTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I3cb93f7128a1bb2a7d24b65772edf4b55e8f9bdf
2024-09-11 18:24:25 +08:00
Haijie Hong
cb478b82f0 Show highlight for device setting items
BUG: 343317785
Test: atest DeviceDetailsFragmentFormatterTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Ifac11881a9a305a39c1d2057ea354a8096f70647
2024-09-11 11:43:38 +08:00
Haijie Hong
1a90869f28 Merge "Make bluetooth profile toggles configurable" into main 2024-09-09 12:56:07 +00:00
Haijie Hong
cd7627c9ff Make bluetooth profile toggles configurable
BUG: 343317785
Test: atest BluetoothDetailsProfilesControllerTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I5aea110f7a42ffee20a56dbd9d5621f44311cc66
2024-09-09 13:23:12 +08:00
Haijie Hong
680df21339 Merge "Show a dialog if bluetooth key is missing when reconnecting" into main 2024-09-06 08:18:55 +00:00
Haijie Hong
f93aaadad0 Show a dialog if bluetooth key is missing when reconnecting
Previous change is reverted due to test failure in b/362901443.

BUG: 360031750
Test: atest BluetoothKeyMissingDialogTest
Flag: com.android.settings.flags.enable_bluetooth_key_missing_dialog
Change-Id: I05b940e8aac26c14f93baa19c224ad98c291b891
2024-09-04 09:05:08 +00:00
Chaitanya Cheemala (xWF)
3605e23587 Merge "Revert "Show a dialog if bluetooth key is missing when reconnecting"" into main 2024-08-29 11:36:05 +00:00
Chaitanya Cheemala (xWF)
29c7cc0cb5 Revert "Show a dialog if bluetooth key is missing when reconnecting"
Revert submission 28985385-bt_key_missing_dialog

Reason for revert: Likely culprit for b/362901443  - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:28985385-bt_key_missing_dialog

Change-Id: I2a3ab8f0dbd2c81eda49d11abc6d586f59f149e9
2024-08-29 10:25:04 +00:00
Haijie Hong
5247f4936d Merge "Show a dialog if bluetooth key is missing when reconnecting" into main 2024-08-29 05:59:34 +00:00
Haijie Hong
34cf0cbea1 Show a dialog if bluetooth key is missing when reconnecting
BUG: 360031750
Test: atest BluetoothKeyMissingDialogTest
Flag: com.android.settings.flags.enable_bluetooth_key_missing_dialog
Change-Id: Iab75675b4cd8fec7ab55516cd0f057a9c7d92f7e
2024-08-28 15:55:35 +08:00
Haijie Hong
4775f41ec6 Merge "Add help button on the top right corner of more settings page" into main 2024-08-28 05:35:57 +00:00
Haijie Hong
ae26d5d17e Add help button on the top right corner of more settings page
BUG: 343317785
Test: atest DeviceDetailsFragmentFormatterTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: I3053c0495d4c3cfefcd4f77c9114c4c8c8fe08ca
2024-08-21 20:54:42 +08:00
Haijie Hong
91536001ba Merge "Clean up legacy bluetooth setting flags" into main 2024-08-21 05:45:25 +00:00
Haijie Hong
15a9f1437d Clean up legacy bluetooth setting flags
BUG: 359415806
Test: atest SettingsRoboTests
Flag: EXEMPT clean up
Change-Id: I7c47d80e61cfb0e3b473106e0784cc96ba639452
2024-08-20 15:38:32 +08:00
Haijie Hong
7cd4a3987f Add device details more settings page
BUG: 343317785
Test: atest DeviceDetailsFragmentFormatterTest
Flag: com.android.settings.flags.enable_bluetooth_device_details_polish
Change-Id: Ia9eff049e73e039ac5d0fb26096ab4e9add60315
2024-08-19 23:41:16 +08:00
Haijie Hong
04f1fea990 Merge "Implement Spatial audio toggle domain layer" into main 2024-08-15 10:54:48 +00:00
Haijie Hong
e3702e9b14 Merge "Rearrange bluetooth device details fragment according to config" into main 2024-08-15 08:13:11 +00:00
Haijie Hong
df2915bd4e Merge "Add owners for bluetooth settings test folder" into main am: 55834fff02 am: 61a2efc807
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3216259

Change-Id: Idd4a63bea7da0801e963d605d17b751643d1a9d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 10:48:35 +00:00
Haijie Hong
61a2efc807 Merge "Add owners for bluetooth settings test folder" into main am: 55834fff02
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3216259

Change-Id: I4835d1b33e1593892054224dec33ea79e64187dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 10:32:20 +00:00
Haijie Hong
6f38de4932 Add owners for bluetooth settings test folder
Change-Id: I1503db974eb271890486581d173c1bde8457f7df
2024-08-14 09:42:21 +00:00