diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-10-02 14:51:46 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-10-02 14:51:46 -0700 |
| commit | c861cf84479d2bb289546e8c4f116beb794842c0 (patch) | |
| tree | 2d2b793eb8ef1bcf9659128885c3ae5653e9e6f6 /src/com/android/settings/SoundSettings.java | |
| parent | fd94d51e945273a942947433aed828884bbaa17f (diff) | |
| download | packages_apps_Settings-c861cf84479d2bb289546e8c4f116beb794842c0.tar.gz packages_apps_Settings-c861cf84479d2bb289546e8c4f116beb794842c0.tar.bz2 packages_apps_Settings-c861cf84479d2bb289546e8c4f116beb794842c0.zip | |
Improved dialog management in Settings>Users
Bug: 7266284 Delete not functional after orientation change
Bug: 7266182 Set up now not functional after orientation change
Also remove "vibrate when ringing" on tablets
Bug: 7253081
Change-Id: Ie616747f2e3292c401613eb2041b5a5a289cde20
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 814ea46a6..83e4fa341 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) { |