aboutsummaryrefslogtreecommitdiffstats
path: root/java/src
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2011-09-20 14:14:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-09-20 14:14:27 -0700
commit30881753c876cc251664814627f6ed17e79ecf50 (patch)
tree9fcde79ff675a67515c3c91b47011899ae687f73 /java/src
parent205a6ce2c85463fb1989e479489d3f533bb63a5c (diff)
parent37af28dd234b64773c0038ac587cac5f99236bd2 (diff)
downloadlatinime-30881753c876cc251664814627f6ed17e79ecf50.tar.gz
latinime-30881753c876cc251664814627f6ed17e79ecf50.tar.xz
latinime-30881753c876cc251664814627f6ed17e79ecf50.zip
am 37af28dd: Enable vibrate on keypress by default
* commit '37af28dd234b64773c0038ac587cac5f99236bd2': Enable vibrate on keypress by default
Diffstat (limited to 'java/src')
-rw-r--r--java/src/com/android/inputmethod/latin/Settings.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/Settings.java b/java/src/com/android/inputmethod/latin/Settings.java
index c97f56712..d706cd0a4 100644
--- a/java/src/com/android/inputmethod/latin/Settings.java
+++ b/java/src/com/android/inputmethod/latin/Settings.java
@@ -171,7 +171,8 @@ public class Settings extends InputMethodSettingsActivity
// Get the settings preferences
final boolean hasVibrator = VibratorCompatWrapper.getInstance(context).hasVibrator();
- mVibrateOn = hasVibrator && prefs.getBoolean(Settings.PREF_VIBRATE_ON, false);
+ mVibrateOn = hasVibrator && prefs.getBoolean(Settings.PREF_VIBRATE_ON,
+ res.getBoolean(R.bool.config_default_vibration_enabled));
mSoundOn = prefs.getBoolean(Settings.PREF_SOUND_ON,
res.getBoolean(R.bool.config_default_sound_enabled));
mKeyPreviewPopupOn = isKeyPreviewPopupEnabled(prefs, res);