diff --git a/res/values/strings.xml b/res/values/strings.xml
index ba919cef29c..950f0c55edf 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4084,6 +4084,13 @@
Delay before click
+
+ %1$s / %2$s
+
+ ON
+
+ OFF
+
Show in Quick Settings
diff --git a/src/com/android/settings/accessibility/AccessibilitySettings.java b/src/com/android/settings/accessibility/AccessibilitySettings.java
index eaadf134667..dca4f8cf87f 100644
--- a/src/com/android/settings/accessibility/AccessibilitySettings.java
+++ b/src/com/android/settings/accessibility/AccessibilitySettings.java
@@ -544,12 +544,15 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
preference.setIcon(icon);
final boolean serviceEnabled = accessibilityEnabled
&& enabledServices.contains(componentName);
- String serviceState = serviceEnabled ?
- getString(R.string.accessibility_feature_state_on) :
- getString(R.string.accessibility_feature_state_off);
- String serviceSummary = info.loadSummary(getPackageManager());
- serviceSummary = (TextUtils.isEmpty(serviceSummary)) ? serviceState :
- serviceSummary;
+ final String serviceState = serviceEnabled ?
+ getString(R.string.accessibility_summary_state_enabled) :
+ getString(R.string.accessibility_summary_state_disabled);
+ final String serviceSummary = info.loadSummary(getPackageManager());
+ final String stateSummaryCombo = getString(
+ R.string.accessibility_summary_default_combination,
+ serviceState, serviceSummary);
+ preference.setSummary((TextUtils.isEmpty(serviceSummary)) ? serviceState
+ : stateSummaryCombo);
// Disable all accessibility services that are not permitted.
boolean serviceAllowed =
@@ -566,7 +569,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
preference.setEnabled(true);
}
- preference.setSummary(serviceSummary);
preference.setFragment(ToggleAccessibilityServicePreferenceFragment.class.getName());
preference.setPersistent(true);