From 2ac8da37d8cc21d34e4232ea7ff0984d5d0e8c1d Mon Sep 17 00:00:00 2001 From: Henrik Baard Date: Wed, 27 Feb 2013 08:57:03 +0100 Subject: [PATCH] Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY There is an array (NEED_VOICE_CAPABILITY) with all keys that should not be present in a device that does not have voice capability. The key KEY_VIBRATE was not part of this array, it was handled separately in the code. Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY and remove the special treatement. Change-Id: I96aa066cec373ccbfe89c46b530feb484f6f8164 --- src/com/android/settings/SoundSettings.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java index 7e461711166..931858ca3c7 100644 --- a/src/com/android/settings/SoundSettings.java +++ b/src/com/android/settings/SoundSettings.java @@ -78,7 +78,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements 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 @@ public class SoundSettings extends SettingsPreferenceFragment implements removePreference(KEY_VIBRATE); removePreference(KEY_HAPTIC_FEEDBACK); } - if (!Utils.isVoiceCapable(getActivity())) { - removePreference(KEY_VIBRATE); - } if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) { ListPreference emergencyTonePreference =