Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9c8d1e94 authored by Lais Andrade's avatar Lais Andrade Committed by Android (Google) Code Review
Browse files

Merge "Create separate On/Off string resources for Vibration & haptics" into tm-dev

parents 9fd4377d cc8790f7

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -5577,6 +5577,10 @@ 
    <string name="accessibility_vibration_settings_title">Vibration &amp; haptics</string>

    <!-- Summary for preference screen for configuring vibrations. [CHAR LIMIT=NONE] -->

    <string name="accessibility_vibration_settings_summary">Control the vibration strength for different usages</string>

    <!-- "Vibration & haptics" preference's state when enabled. This text is shown next to the "Vibration & haptics" preference title. [CHAR LIMIT=NONE] -->

    <string name="accessibility_vibration_settings_state_on">On</string>

    <!-- "Vibration & haptics" preference's state when disabled. This text is shown next to the "Vibration & haptics" preference title. [CHAR LIMIT=NONE] -->

    <string name="accessibility_vibration_settings_state_off">Off</string>

    <!-- Summary for vibration preference shown when it is disabled because the device is in silent mode. [CHAR LIMIT=NONE] -->

    <string name="accessibility_vibration_setting_disabled_for_silent_mode_summary">Setting disabled because device is set to silent</string>

    <!-- Title for the category of preferences to configure device vibrations related to calls. [CHAR LIMIT=NONE] -->

src/com/android/settings/accessibility/VibrationPreferenceController.java

+4 −1
Original line number Diff line number Diff line
@@ -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);

    }

}

tests/robotests/src/com/android/settings/accessibility/VibrationPreferenceControllerTest.java

+3 −3
Original line number Diff line number Diff line
@@ -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() {