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

Commit 16eec505 authored by Julia Reynolds's avatar Julia Reynolds
Browse files

Remove blank switchtext from switch preferences. 

This makes TTS services read the default text (on/off) when
these switches are toggled.

Bug: 22530662
Change-Id: I77c5918481faa6309995aa385dcfc3608fc94298
parent 046decca

res/xml/notification_settings.xml

+0 −2
Original line number Diff line number Diff line
@@ -100,8 +100,6 @@ 
        <SwitchPreference

                android:key="notification_pulse"

                android:title="@string/notification_pulse_title"

                android:switchTextOff=""

                android:switchTextOn=""

                android:persistent="false" />



         <!-- When device is locked -->

res/xml/other_sound_settings.xml

+0 −12
Original line number Diff line number Diff line
@@ -23,48 +23,36 @@ 
    <SwitchPreference

            android:key="dial_pad_tones"

            android:title="@string/dial_pad_tones_title"

            android:switchTextOff=""

            android:switchTextOn=""

            android:persistent="false" />



    <!-- Screen locking sounds -->

    <SwitchPreference

            android:key="screen_locking_sounds"

            android:title="@string/screen_locking_sounds_title"

            android:switchTextOff=""

            android:switchTextOn=""

            android:persistent="false" />



    <!-- Charging sounds -->

    <SwitchPreference

            android:key="charging_sounds"

            android:title="@string/charging_sounds_title"

            android:switchTextOff=""

            android:switchTextOn=""

            android:persistent="false" />



    <!-- Docking sounds -->

    <SwitchPreference

            android:key="docking_sounds"

            android:title="@string/docking_sounds_title"

            android:switchTextOff=""

            android:switchTextOn=""

            android:persistent="false" />



    <!-- Touch sounds -->

    <SwitchPreference

            android:key="touch_sounds"

            android:title="@string/touch_sounds_title"

            android:switchTextOff=""

            android:switchTextOn=""

            android:persistent="false" />



    <!-- Vibrate on touch -->

    <SwitchPreference

            android:key="vibrate_on_touch"

            android:title="@string/vibrate_on_touch_title"

            android:switchTextOff=""

            android:switchTextOn=""

            android:persistent="false" />



    <!-- Dock speaker plays -->

res/xml/zen_mode_priority_settings.xml

+4 −12
Original line number Diff line number Diff line
@@ -25,25 +25,19 @@ 
        android:title="@string/zen_mode_alarms"

        android:enabled="false"

        android:defaultValue="true"

        android:persistent="false"

        android:switchTextOff=""

        android:switchTextOn="" />

        android:persistent="false"/>



    <!-- Reminders -->

    <SwitchPreference

        android:key="reminders"

        android:title="@string/zen_mode_reminders"

        android:persistent="false"

        android:switchTextOff=""

        android:switchTextOn="" />

        android:persistent="false"/>



    <!-- Events -->

    <SwitchPreference

        android:key="events"

        android:title="@string/zen_mode_events"

        android:persistent="false"

        android:switchTextOff=""

        android:switchTextOn="" />

        android:persistent="false"/>



    <!-- Messages -->

    <com.android.settings.DropDownPreference
@@ -61,8 +55,6 @@ 
    <SwitchPreference

        android:key="repeat_callers"

        android:title="@string/zen_mode_repeat_callers"

        android:persistent="false"

        android:switchTextOff=""

        android:switchTextOn="" />

        android:persistent="false"/>



</PreferenceScreen>