PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 8560ae2f: am 0c03b50a: Merge "Remove blank switchtext from switch preferences." into mnc-dev

Browse Source 
* commit '8560ae2f8752f611ffee651289519a7993b3e500':
  Remove blank switchtext from switch preferences.
This commit is contained in:
Julia Reynolds
2015-07-17 20:40:19 +00:00
committed by Android Git Automerger
parent e5a95396da 8560ae2f87
commit 03b1b4f33f
3 changed files with 4 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/notification_settings.xml
View File

@@ -100,8 +100,6 @@
<SwitchPreference <SwitchPreference
android:key="notification_pulse" android:key="notification_pulse"
android:title="@string/notification_pulse_title" android:title="@string/notification_pulse_title"
android:switchTextOff=""
android:switchTextOn=""
android:persistent="false" /> android:persistent="false" />
<!-- When device is locked --> <!-- When device is locked -->

12
res/xml/other_sound_settings.xml
View File

@@ -23,48 +23,36 @@
<SwitchPreference <SwitchPreference
android:key="dial_pad_tones" android:key="dial_pad_tones"
android:title="@string/dial_pad_tones_title" android:title="@string/dial_pad_tones_title"
android:switchTextOff=""
android:switchTextOn=""
android:persistent="false" /> android:persistent="false" />
<!-- Screen locking sounds --> <!-- Screen locking sounds -->
<SwitchPreference <SwitchPreference
android:key="screen_locking_sounds" android:key="screen_locking_sounds"
android:title="@string/screen_locking_sounds_title" android:title="@string/screen_locking_sounds_title"
android:switchTextOff=""
android:switchTextOn=""
android:persistent="false" /> android:persistent="false" />
<!-- Charging sounds --> <!-- Charging sounds -->
<SwitchPreference <SwitchPreference
android:key="charging_sounds" android:key="charging_sounds"
android:title="@string/charging_sounds_title" android:title="@string/charging_sounds_title"
android:switchTextOff=""
android:switchTextOn=""
android:persistent="false" /> android:persistent="false" />
<!-- Docking sounds --> <!-- Docking sounds -->
<SwitchPreference <SwitchPreference
android:key="docking_sounds" android:key="docking_sounds"
android:title="@string/docking_sounds_title" android:title="@string/docking_sounds_title"
android:switchTextOff=""
android:switchTextOn=""
android:persistent="false" /> android:persistent="false" />
<!-- Touch sounds --> <!-- Touch sounds -->
<SwitchPreference <SwitchPreference
android:key="touch_sounds" android:key="touch_sounds"
android:title="@string/touch_sounds_title" android:title="@string/touch_sounds_title"
android:switchTextOff=""
android:switchTextOn=""
android:persistent="false" /> android:persistent="false" />
<!-- Vibrate on touch --> <!-- Vibrate on touch -->
<SwitchPreference <SwitchPreference
android:key="vibrate_on_touch" android:key="vibrate_on_touch"
android:title="@string/vibrate_on_touch_title" android:title="@string/vibrate_on_touch_title"
android:switchTextOff=""
android:switchTextOn=""
android:persistent="false" /> android:persistent="false" />
<!-- Dock speaker plays --> <!-- Dock speaker plays -->

16
res/xml/zen_mode_priority_settings.xml
View File

@@ -25,25 +25,19 @@
android:title="@string/zen_mode_alarms" android:title="@string/zen_mode_alarms"
android:enabled="false" android:enabled="false"
android:defaultValue="true" android:defaultValue="true"
android:persistent="false" android:persistent="false"/>
android:switchTextOff=""
android:switchTextOn="" />
<!-- Reminders --> <!-- Reminders -->
<SwitchPreference <SwitchPreference
android:key="reminders" android:key="reminders"
android:title="@string/zen_mode_reminders" android:title="@string/zen_mode_reminders"
android:persistent="false" android:persistent="false"/>
android:switchTextOff=""
android:switchTextOn="" />
<!-- Events --> <!-- Events -->
<SwitchPreference <SwitchPreference
android:key="events" android:key="events"
android:title="@string/zen_mode_events" android:title="@string/zen_mode_events"
android:persistent="false" android:persistent="false"/>
android:switchTextOff=""
android:switchTextOn="" />
<!-- Messages --> <!-- Messages -->
<com.android.settings.DropDownPreference <com.android.settings.DropDownPreference
@@ -61,8 +55,6 @@
<SwitchPreference <SwitchPreference
android:key="repeat_callers" android:key="repeat_callers"
android:title="@string/zen_mode_repeat_callers" android:title="@string/zen_mode_repeat_callers"
android:persistent="false" android:persistent="false"/>
android:switchTextOff=""
android:switchTextOn="" />
</PreferenceScreen> </PreferenceScreen>