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

Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"

Browse Source
This commit is contained in:
Amith Yamasani
2013-03-12 21:56:41 +00:00
committed by Gerrit Code Review
parent 6e0bff0d1b 2ac8da37d8
commit 506b68e1c5
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/SoundSettings.java
View File

@@ -78,7 +78,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements
private static final String[] NEED_VOICE_CAPABILITY = { private static final String[] NEED_VOICE_CAPABILITY = {
KEY_RINGTONE, KEY_DTMF_TONE, KEY_CATEGORY_CALLS, 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; private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;
@@ -175,9 +175,6 @@ public class SoundSettings extends SettingsPreferenceFragment implements
removePreference(KEY_VIBRATE); removePreference(KEY_VIBRATE);
removePreference(KEY_HAPTIC_FEEDBACK); removePreference(KEY_HAPTIC_FEEDBACK);
} }
if (!Utils.isVoiceCapable(getActivity())) {
removePreference(KEY_VIBRATE);
}
if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) { if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {
ListPreference emergencyTonePreference = ListPreference emergencyTonePreference =