Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY" (506b68e1) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SoundSettings.java

+1 −4

Original line number	Diff line number	Diff line
		@@ -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 =