diff options
| author | 2025-03-21 01:55:57 -0700 | |
|---|---|---|
| committer | 2025-03-21 01:55:57 -0700 | |
| commit | dc34cabee18fa12f57f0a217039fd5c3394300c1 (patch) | |
| tree | 4d3cc03f67178a50f1b6ad351a4aa407192ce989 /res | |
| parent | 9d9dd7e3f5b0bc9f109a2c16a35728d2ceae0040 (diff) | |
| parent | e3eb185e007cbbf7d27dafc9c6214fdb59aef177 (diff) | |
Merge "Show hearing device pairing intro according to the device's supported status" into main
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | res/xml/hearing_device_pairing_fragment.xml | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index fc4d7536524..5af29f9c53f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5934,6 +5934,10 @@ <string name="accessibility_hearing_device_pairing_page_title">Pair hearing device</string> <!-- Subtitle for the pair hearing device page. [CHAR LIMIT=NONE] --> <string name="accessibility_hearing_device_pairing_intro">You can pair ASHA and LE Audio hearing devices on this page. Make sure your hearing device is turned on and ready to pair.</string> + <!-- Subtitle for the pair hearing device page. This string is for device that only supports ASHA hearing aids. [CHAR LIMIT=NONE] --> + <string name="accessibility_hearing_device_pairing_asha_only_intro">You can pair ASHA hearing devices on this page. Make sure your hearing device is turned on and ready to pair.</string> + <!-- Subtitle for the pair hearing device page. This string is for device that only supports LE Audio hearing aids. [CHAR LIMIT=NONE] --> + <string name="accessibility_hearing_device_pairing_hap_only_intro">You can pair LE Audio hearing devices on this page. Make sure your hearing device is turned on and ready to pair.</string> <!-- Title for the preference category containing the list of the available hearing during and after bluetooth scanning devices. [CHAR LIMIT=30] --> <string name="accessibility_found_hearing_devices">Available hearing devices</string> <!-- Title for the preference category containing the all bluetooth devices during and after bluetooth scanning devices. Used when people can not find their hearing device in hearing device pairing list. [CHAR LIMIT=45] --> diff --git a/res/xml/hearing_device_pairing_fragment.xml b/res/xml/hearing_device_pairing_fragment.xml index d84f22bd5d7..782d7c0cdc5 100644 --- a/res/xml/hearing_device_pairing_fragment.xml +++ b/res/xml/hearing_device_pairing_fragment.xml @@ -20,8 +20,10 @@ android:title="@string/bluetooth_pairing_pref_title"> <com.android.settingslib.widget.TopIntroPreference + android:key="hearing_device_pairing_intro" settings:searchable="false" - android:title="@string/accessibility_hearing_device_pairing_intro" /> + android:title="@string/accessibility_hearing_device_pairing_intro" + settings:controller="com.android.settings.accessibility.HearingDevicePairingIntroPreferenceController"/> <com.android.settings.bluetooth.BluetoothProgressCategory android:key="available_hearing_devices" |