diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-05-29 23:37:09 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-05-29 23:37:09 -0700 |
| commit | 3d7312af5b7265bc98738c0d1143cdbbedd541a6 (patch) | |
| tree | 9a88daad1bd8d26c2b056a9fb6f7902915fb2c12 /java/src | |
| parent | 046f7fc7022f169014e22cf347eb027481eeff97 (diff) | |
| parent | 40bab488cb70875f46e29f595d577cc6cc4a9264 (diff) | |
| download | latinime-3d7312af5b7265bc98738c0d1143cdbbedd541a6.tar.gz latinime-3d7312af5b7265bc98738c0d1143cdbbedd541a6.tar.xz latinime-3d7312af5b7265bc98738c0d1143cdbbedd541a6.zip | |
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
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( |