am 40bab488: am 4f78f8cb: Merge "Remove a vibration-related option when there\'s no vibrator" into jb-dev

* commit '40bab488cb70875f46e29f595d577cc6cc4a9264':
  Remove a vibration-related option when there's no vibrator
This commit is contained in:
Jean Chalard 2012-05-29 23:37:09 -07:00 committed by Android Git Automerger
commit 3d7312af5b

View file

@ -151,6 +151,11 @@ public class Settings extends InputMethodSettingsFragment
if (!VibratorUtils.getInstance(context).hasVibrator()) {
generalSettings.removePreference(findPreference(PREF_VIBRATE_ON));
final PreferenceGroup advancedSettings =
(PreferenceGroup) findPreference(PREF_ADVANCED_SETTINGS);
if (null != advancedSettings) { // Theoretically advancedSettings cannot be null
advancedSettings.removePreference(findPreference(PREF_VIBRATION_DURATION_SETTINGS));
}
}
final boolean showPopupOption = res.getBoolean(