diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 71e16f0a183..02d3c9b022e 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -255,7 +255,7 @@
- - Decide automatically
+ - Use app default
- Play on hearing device
- Play on phone speaker
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a5b1aa17a67..90d367dd51b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -137,22 +137,20 @@
Audio output
- Choose whether different types of audio are played on your hearing device or phone speaker
+ Route sounds to your hearing device or phone speaker
Related
-
- Ringtone
+
+ Ringtone and alarms
- Call
+ Audio during calls
Media
-
- System sounds
-
- Play on hearing device
-
- Play on phone speaker
+
+ Notifications and other system sounds
+
+ By default, audio output is determined by individual apps
Unnamed Bluetooth device
@@ -4591,6 +4589,8 @@
Continue
Hearing devices
+
+ You can use hearing aids, cochlear implants, and other amplification devices with your phone
No hearing aids connected
@@ -4622,9 +4622,9 @@
Hearing aid compatibility
- Improve audio for some hearing devices
+ Improves compatibility with telecoils and reduces unwanted noise
- Make sure your hearing devices are turned on and in pairing mode
+ Make sure your hearing device is turned on and ready to pair
Pair hearing device
@@ -4632,7 +4632,7 @@
Don\u2019t see your hearing device?
- View all Bluetooth devices
+ See more devices
Audio adjustment
@@ -4885,7 +4885,7 @@
motor, mouse
- hard of hearing, hearing loss
+ hearing aids, hard of hearing, hearing loss, cochlear implants, amplification devices, sound processors
hard of hearing, hearing loss, captions, Teletype, tty
diff --git a/res/xml/accessibility_hearing_aids.xml b/res/xml/accessibility_hearing_aids.xml
index 76910a03d0f..7ff571d7fe9 100644
--- a/res/xml/accessibility_hearing_aids.xml
+++ b/res/xml/accessibility_hearing_aids.xml
@@ -19,6 +19,9 @@
android:key="accessibility_hearing_devices_screen"
android:title="@string/accessibility_hearingaid_title">
+
+
+ android:key="hearing_options_category"
+ android:title="@string/accessibility_screen_option">
+
+
diff --git a/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java b/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java
index 4641a15f1de..547c4568991 100644
--- a/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java
+++ b/src/com/android/settings/accessibility/AccessibilityHearingAidsFragment.java
@@ -38,7 +38,7 @@ import com.android.settingslib.search.SearchIndexable;
public class AccessibilityHearingAidsFragment extends AccessibilityShortcutPreferenceFragment {
private static final String TAG = "AccessibilityHearingAidsFragment";
- private static final String KEY_DEVICE_CONTROL_CATEGORY = "device_control_category";
+ private static final String KEY_HEARING_OPTIONS_CATEGORY = "hearing_options_category";
private static final int FIRST_PREFERENCE_IN_CATEGORY_INDEX = -1;
private String mFeatureName;
@@ -63,8 +63,8 @@ public class AccessibilityHearingAidsFragment extends AccessibilityShortcutPrefe
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
final View view = super.onCreateView(inflater, container, savedInstanceState);
- final PreferenceCategory controlCategory = findPreference(KEY_DEVICE_CONTROL_CATEGORY);
- // Move the preference under controlCategory need to remove the original first.
+ final PreferenceCategory controlCategory = findPreference(KEY_HEARING_OPTIONS_CATEGORY);
+ // To move the shortcut preference under controlCategory need to remove the original added.
mShortcutPreference.setOrder(FIRST_PREFERENCE_IN_CATEGORY_INDEX);
getPreferenceScreen().removePreference(mShortcutPreference);
controlCategory.addPreference(mShortcutPreference);
@@ -110,7 +110,8 @@ public class AccessibilityHearingAidsFragment extends AccessibilityShortcutPrefe
@Override
protected boolean showGeneralCategory() {
- // Have customized category for accessibility hearings aids page.
+ // Have static preference under dynamically created PreferenceCategory KEY_GENERAL_CATEGORY.
+ // In order to modify that, we need to use our own PreferenceCategory for this page.
return false;
}