commit 506b68e1c586ea3956c939c4181f11e5a112a2f5
author Amith Yamasani <yamasani@google.com> Tue Mar 12 21:56:41 2013 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 12 21:56:42 2013 +0000
tree a5e8117c70561fe6077c88b8678a2a74b9d28d82
parent 6e0bff0d1bc52b90a4219b26f93ed41329415098
parent 2ac8da37d8cc21d34e4232ea7ff0984d5d0e8c1d

Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"

src/com/android/settings/SoundSettings.java

diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 7e461711..931858c 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -78,7 +78,7 @@
 
     private static final String[] NEED_VOICE_CAPABILITY = {
             KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS,
-            KEY_EMERGENCY_TONE
+            KEY_EMERGENCY_TONE, KEY_VIBRATE
     };
 
     private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;
@@ -175,9 +175,6 @@
             removePreference(KEY_VIBRATE);
             removePreference(KEY_HAPTIC_FEEDBACK);
         }
-        if (!Utils.isVoiceCapable(getActivity())) {
-            removePreference(KEY_VIBRATE);
-        }
 
         if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {
             ListPreference emergencyTonePreference =