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

am 506b68e1: Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"

Browse Source 
* commit '506b68e1c586ea3956c939c4181f11e5a112a2f5':
  Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY
This commit is contained in:
Amith Yamasani
2013-03-12 15:42:57 -07:00
committed by Android Git Automerger
parent 565af3834c 506b68e1c5
commit 8749f35f71
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 =