diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2011-09-20 14:14:27 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-09-20 14:14:27 -0700 |
| commit | 30881753c876cc251664814627f6ed17e79ecf50 (patch) | |
| tree | 9fcde79ff675a67515c3c91b47011899ae687f73 /java | |
| parent | 205a6ce2c85463fb1989e479489d3f533bb63a5c (diff) | |
| parent | 37af28dd234b64773c0038ac587cac5f99236bd2 (diff) | |
| download | latinime-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')
| -rw-r--r-- | java/res/values/config.xml | 1 | ||||
| -rw-r--r-- | java/res/values/keypress-vibration-durations.xml | 2 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 1 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Settings.java | 3 |
4 files changed, 5 insertions, 2 deletions
diff --git a/java/res/values/config.xml b/java/res/values/config.xml index 8cfa6802c..999247839 100644 --- a/java/res/values/config.xml +++ b/java/res/values/config.xml @@ -39,6 +39,7 @@ <bool name="config_default_bigram_prediction">false</bool> <bool name="config_default_compat_recorrection_enabled">true</bool> <bool name="config_default_sound_enabled">false</bool> + <bool name="config_default_vibration_enabled">true</bool> <bool name="config_auto_correction_spacebar_led_enabled">true</bool> <!-- Showing mini keyboard, just above the touched point if true, aligned to the key if false --> <bool name="config_show_mini_keyboard_at_touched_point">false</bool> diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml index d50986629..2569f2317 100644 --- a/java/res/values/keypress-vibration-durations.xml +++ b/java/res/values/keypress-vibration-durations.xml @@ -20,7 +20,7 @@ <resources> <string-array name="keypress_vibration_durations" translatable="false"> <!-- Build.HARDWARE,duration_in_milliseconds --> - <item>herring,4</item> + <item>herring,5</item> <item>tuna,5</item> </string-array> </resources> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 43bbd6512..24de95f10 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -32,6 +32,7 @@ <CheckBoxPreference android:key="vibrate_on" android:title="@string/vibrate_on_keypress" + android:defaultValue="@bool/config_default_vibration_enabled" android:persistent="true" /> <CheckBoxPreference android:key="sound_on" 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); |