diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-06-18 08:56:09 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-06-18 08:56:09 -0700 |
| commit | 7c1c4f354461de5127bf9b7c4febdd0056a3dc58 (patch) | |
| tree | 02fbedb34125328e1af2cb1b8f01d576ecebfd7b /java | |
| parent | 0cae172563728bc94a9af4aa098adb7b6d00cd76 (diff) | |
| parent | af69a14c9684ef6f7a14e60cb635f96db530f6e7 (diff) | |
| download | latinime-7c1c4f354461de5127bf9b7c4febdd0056a3dc58.tar.gz latinime-7c1c4f354461de5127bf9b7c4febdd0056a3dc58.tar.xz latinime-7c1c4f354461de5127bf9b7c4febdd0056a3dc58.zip | |
am af69a14c: Use system default vibration pattern
* commit 'af69a14c9684ef6f7a14e60cb635f96db530f6e7':
Use system default vibration pattern
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/keypress-vibration-durations.xml | 4 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsFragment.java | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml index e8d92256b..e2f2b56e5 100644 --- a/java/res/values/keypress-vibration-durations.xml +++ b/java/res/values/keypress-vibration-durations.xml @@ -56,7 +56,7 @@ <item>MODEL=XT907:MANUFACTURER=motorola,30</item> <!-- Sony Xperia Z --> <item>MODEL=C6603:MANUFACTURER=Sony,35</item> - <!-- Default value for unknown device --> - <item>,20</item> + <!-- Default value for unknown device. The negative value means system default. --> + <item>,-1</item> </string-array> </resources> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index 85abb08fe..cdc2c3a09 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -79,6 +79,8 @@ <!-- Units abbreviation for the duration (milliseconds) [CHAR LIMIT=10] --> <string name="abbreviation_unit_milliseconds"><xliff:g id="milliseconds">%s</xliff:g>ms</string> + <!-- The text that represents the current settings value is the system default [CHAR LIMIT=20] --> + <string name="settings_system_default">System default</string> <!-- Option name for enabling or disabling the use of names of people in Contacts for suggestion and correction [CHAR LIMIT=25] --> <string name="use_contacts_dict">Suggest Contact names</string> diff --git a/java/src/com/android/inputmethod/latin/SettingsFragment.java b/java/src/com/android/inputmethod/latin/SettingsFragment.java index 9cc178598..6587b40ab 100644 --- a/java/src/com/android/inputmethod/latin/SettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/SettingsFragment.java @@ -367,6 +367,9 @@ public final class SettingsFragment extends InputMethodSettingsFragment @Override public String getValueText(final int value) { + if (value < 0) { + return res.getString(R.string.settings_system_default); + } return res.getString(R.string.abbreviation_unit_milliseconds, value); } }); |