diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-05-29 23:31:44 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-05-29 23:31:44 -0700 |
| commit | 4f78f8cb795a754bbe36b3334cb77e2a5b59c278 (patch) | |
| tree | a801b4f584f692ecc1d942ce3d55be0c307a32dd /java/src | |
| parent | 62cd919dca9ef85cdd045b539b3ef85e921c6e4c (diff) | |
| parent | c7f2878cf5d507cce19adbe7dcb75f359366ccd9 (diff) | |
| download | latinime-4f78f8cb795a754bbe36b3334cb77e2a5b59c278.tar.gz latinime-4f78f8cb795a754bbe36b3334cb77e2a5b59c278.tar.xz latinime-4f78f8cb795a754bbe36b3334cb77e2a5b59c278.zip | |
Merge "Remove a vibration-related option when there's no vibrator" into jb-dev
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java index 08f3e8456..c9ff0a5a8 100644 --- a/java/src/com/android/inputmethod/latin/Settings.java +++ b/java/src/com/android/inputmethod/latin/Settings.java @@ -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( |