diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-02 17:29:27 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-10-02 17:29:28 -0700 |
| commit | a8f3a204d908330e31c29a11d5a83b8ba40a9610 (patch) | |
| tree | c76fc41f70587952b05533a9d2906cc9a3f5d96a /src/com/android/settings/SoundSettings.java | |
| parent | d13e3396852b4a98c46f2fc02d7a81dcdc1ab7f5 (diff) | |
| parent | c861cf84479d2bb289546e8c4f116beb794842c0 (diff) | |
| download | packages_apps_settings-a8f3a204d908330e31c29a11d5a83b8ba40a9610.zip packages_apps_settings-a8f3a204d908330e31c29a11d5a83b8ba40a9610.tar.gz packages_apps_settings-a8f3a204d908330e31c29a11d5a83b8ba40a9610.tar.bz2 | |
Merge "Improved dialog management in Settings>Users" into jb-mr1-dev
Diffstat (limited to 'src/com/android/settings/SoundSettings.java')
| -rw-r--r-- | src/com/android/settings/SoundSettings.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/com/android/settings/SoundSettings.java b/src/com/android/settings/SoundSettings.java index 3b02739..587acab 100644 --- a/src/com/android/settings/SoundSettings.java +++ b/src/com/android/settings/SoundSettings.java @@ -170,8 +170,11 @@ public class SoundSettings extends SettingsPreferenceFragment implements Vibrator vibrator = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE); if (vibrator == null || !vibrator.hasVibrator()) { - getPreferenceScreen().removePreference(mVibrateWhenRinging); - getPreferenceScreen().removePreference(mHapticFeedback); + removePreference(KEY_VIBRATE); + removePreference(KEY_HAPTIC_FEEDBACK); + } + if (!Utils.isVoiceCapable(getActivity())) { + removePreference(KEY_VIBRATE); } if (TelephonyManager.PHONE_TYPE_CDMA == activePhoneType) { |