diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-06-18 09:05:47 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-06-18 09:05:47 -0700 |
| commit | 6e86ebe822e2621f8eb3ae7b87c9e58f992bc487 (patch) | |
| tree | 94b1f226f20b8521826eb6817f616e4f6d9ad0f8 /java | |
| parent | 7c1c4f354461de5127bf9b7c4febdd0056a3dc58 (diff) | |
| parent | c90181d6aa42c4c0b56ccc21528dcef84d186c53 (diff) | |
| download | latinime-6e86ebe822e2621f8eb3ae7b87c9e58f992bc487.tar.gz latinime-6e86ebe822e2621f8eb3ae7b87c9e58f992bc487.tar.xz latinime-6e86ebe822e2621f8eb3ae7b87c9e58f992bc487.zip | |
am c90181d6: Use system default key press volume
* commit 'c90181d6aa42c4c0b56ccc21528dcef84d186c53':
Use system default key press volume
Diffstat (limited to 'java')
| -rw-r--r-- | java/res/values/keypress-volumes.xml | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/latin/SettingsFragment.java | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/java/res/values/keypress-volumes.xml b/java/res/values/keypress-volumes.xml index a096c341b..d359055c2 100644 --- a/java/res/values/keypress-volumes.xml +++ b/java/res/values/keypress-volumes.xml @@ -26,7 +26,7 @@ <item>HARDWARE=grouper,0.3f</item> <item>HARDWARE=mako,0.3f</item> <item>HARDWARE=manta,0.2f</item> - <!-- Default value for unknown device --> - <item>,0.2f</item> + <!-- Default value for unknown device. The negative value means system default. --> + <item>,-1.0f</item> </string-array> </resources> diff --git a/java/src/com/android/inputmethod/latin/SettingsFragment.java b/java/src/com/android/inputmethod/latin/SettingsFragment.java index 6587b40ab..8017ce161 100644 --- a/java/src/com/android/inputmethod/latin/SettingsFragment.java +++ b/java/src/com/android/inputmethod/latin/SettingsFragment.java @@ -453,6 +453,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 Integer.toString(value); } |