summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/SoundSettings.java
diff options
context:
space:
mode:
authorfuzz <fuzzzzzzzzzzzzzzzzzz@gmail.com>2013-03-15 23:25:52 +0900
committerfuzz <fuzzzzzzzzzzzzzzzzzz@gmail.com>2013-03-16 09:08:53 +0900
commitcd9c61eabb31e7189c1a4a5a12099012766878ca (patch)
treed5bf5d19912050070fea218d74635ba8a8deac24 /src/com/android/settings/SoundSettings.java
parentb8a63a430ae4855b10a159ac4eb4cd4a24e474bc (diff)
downloadpackages_apps_settings-cd9c61eabb31e7189c1a4a5a12099012766878ca.zip
packages_apps_settings-cd9c61eabb31e7189c1a4a5a12099012766878ca.tar.gz
packages_apps_settings-cd9c61eabb31e7189c1a4a5a12099012766878ca.tar.bz2
Allow to hide Vibrate on notification option if it's not supported
also improve codes for need voice capability Change-Id: If99335301af80c5f5d2c1ed3c20430cb363a690c
Diffstat (limited to 'src/com/android/settings/SoundSettings.java')
-rw-r--r--src/com/android/settings/SoundSettings.java6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java
index 8af0c67..a9a1071 100644
--- a/src/com/android/settings/SoundSettings.java
+++ b/src/com/android/settings/SoundSettings.java
@@ -97,7 +97,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_INCREASING_RING
+ KEY_EMERGENCY_TONE, KEY_INCREASING_RING, KEY_VIBRATE
};
private static final int MSG_UPDATE_RINGTONE_SUMMARY = 1;
@@ -265,9 +265,7 @@ public class SoundSettings extends SettingsPreferenceFragment implements
if (vibrator == null || !vibrator.hasVibrator()) {
removePreference(KEY_VIBRATE);
removePreference(KEY_HAPTIC_FEEDBACK);
- }
- if (!Utils.isVoiceCapable(getActivity())) {
- removePreference(KEY_VIBRATE);
+ removePreference(KEY_CONVERT_SOUND_TO_VIBRATE);
}
if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) {