diff --git a/res/values/strings.xml b/res/values/strings.xml index f87b489f5d6..59db795d30f 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5577,6 +5577,10 @@ Vibration & haptics Control the vibration strength for different usages + + On + + Off Setting disabled because device is set to silent diff --git a/src/com/android/settings/accessibility/VibrationPreferenceController.java b/src/com/android/settings/accessibility/VibrationPreferenceController.java index d1faedd78bb..61606b8f397 100644 --- a/src/com/android/settings/accessibility/VibrationPreferenceController.java +++ b/src/com/android/settings/accessibility/VibrationPreferenceController.java @@ -44,6 +44,9 @@ public class VibrationPreferenceController extends BasePreferenceController { public CharSequence getSummary() { final boolean isVibrateOn = Settings.System.getInt(mContext.getContentResolver(), Settings.System.VIBRATE_ON, ON) == ON; - return mContext.getText(isVibrateOn ? R.string.switch_on_text : R.string.switch_off_text); + return mContext.getText( + isVibrateOn + ? R.string.accessibility_vibration_settings_state_on + : R.string.accessibility_vibration_settings_state_off); } } diff --git a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java index 40e31fd2d63..a045deaa81a 100644 --- a/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java @@ -92,7 +92,7 @@ public class VibrationPreferenceControllerTest { controller.updateState(mPreference); assertThat(mPreference.getSummary().toString()).isEqualTo( - mContext.getString(R.string.switch_on_text)); + mContext.getString(R.string.accessibility_vibration_settings_state_on)); } @Test @@ -103,7 +103,7 @@ public class VibrationPreferenceControllerTest { controller.updateState(mPreference); assertThat(mPreference.getSummary().toString()).isEqualTo( - mContext.getString(R.string.switch_on_text)); + mContext.getString(R.string.accessibility_vibration_settings_state_on)); } @Test @@ -114,7 +114,7 @@ public class VibrationPreferenceControllerTest { controller.updateState(mPreference); assertThat(mPreference.getSummary().toString()).isEqualTo( - mContext.getString(R.string.switch_off_text)); + mContext.getString(R.string.accessibility_vibration_settings_state_off)); } private VibrationPreferenceController createPreferenceController() {