diff options
| author | Daisuke Miyakawa <dmiyakawa@google.com> | 2012-02-22 18:35:26 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-22 18:35:26 -0800 |
| commit | 94cd0af7356736e18a94764d475f677bba5470ec (patch) | |
| tree | 8f3d9fd7a34fd4dc81dfa11d1017f3fcdee50b59 /res | |
| parent | e4b09cf191887edd25731b2dd419f6eb5ffb7699 (diff) | |
| parent | b9bac4a98edc578d8cc0e34e3cc65a5848d0cf44 (diff) | |
| download | packages_apps_Settings-94cd0af7356736e18a94764d475f677bba5470ec.zip packages_apps_Settings-94cd0af7356736e18a94764d475f677bba5470ec.tar.gz packages_apps_Settings-94cd0af7356736e18a94764d475f677bba5470ec.tar.bz2 | |
Merge "Remove "Vibrate and ring" option"
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 2 | ||||
| -rw-r--r-- | res/xml/sound_settings.xml | 5 |
2 files changed, 0 insertions, 7 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index e01caae..aa63f25 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1512,8 +1512,6 @@ <string name="ring_volume_title">Ringer volume</string> <!-- Sound settings screen, setting option name checkbox --> <string name="vibrate_in_silent_title">Vibrate when silent</string> - <!-- Sound settings screen, setting option name checkbox --> - <string name="vibrate_on_ring_title">Vibrate and ring</string> <!-- Sound settings screen, setting option name --> <string name="notification_sound_title">Default notification</string> <!-- Sound settings screen, notification light repeat pulsing title --> diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml index a61e0e1..d7c692f 100644 --- a/res/xml/sound_settings.xml +++ b/res/xml/sound_settings.xml @@ -58,11 +58,6 @@ android:persistent="false" android:ringtoneType="notification" /> - <CheckBoxPreference - android:key="vibrate_on_ring" - android:title="@string/vibrate_on_ring_title" - android:defaultValue="false" /> - <PreferenceCategory android:title="@string/sound_category_feedback_title"/> |