aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'java/res/values')
-rw-r--r--java/res/values/donottranslate.xml1
-rw-r--r--java/res/values/keyboard-heights.xml2
-rw-r--r--java/res/values/keypress-vibration-durations.xml2
-rw-r--r--java/res/values/keypress-volumes.xml14
-rw-r--r--java/res/values/phantom-sudden-move-event-device-list.xml5
-rw-r--r--java/res/values/strings.xml3
-rw-r--r--java/res/values/sudden-jumping-touch-event-device-list.xml8
7 files changed, 25 insertions, 10 deletions
diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml
index a6ea8a061..193a0191e 100644
--- a/java/res/values/donottranslate.xml
+++ b/java/res/values/donottranslate.xml
@@ -233,6 +233,5 @@
<!-- dictionary pack package name /settings activity (for shared prefs and settings) -->
<string name="dictionary_pack_package_name">com.google.android.inputmethod.latin.dictionarypack</string>
<string name="dictionary_pack_settings_activity">com.google.android.inputmethod.latin.dictionarypack.DictionarySettingsActivity</string>
- <string name="settings_ms">ms</string>
<string name="settings_warning_researcher_mode">Attention! You are using the special keyboard for research purposes.</string>
</resources>
diff --git a/java/res/values/keyboard-heights.xml b/java/res/values/keyboard-heights.xml
index 7d85994be..418d3e5b6 100644
--- a/java/res/values/keyboard-heights.xml
+++ b/java/res/values/keyboard-heights.xml
@@ -33,5 +33,7 @@
<!-- Preferable keyboard height in absolute scale: 48.0mm -->
<!-- Xoom -->
<item>stingray,283.1337</item>
+ <!-- Default value for unknown device: empty string -->
+ <item>DEFAULT,</item>
</string-array>
</resources>
diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml
index 370959c1a..9b1d5431e 100644
--- a/java/res/values/keypress-vibration-durations.xml
+++ b/java/res/values/keypress-vibration-durations.xml
@@ -24,5 +24,7 @@
<item>tuna,5</item>
<item>mako,5</item>
<item>manta,16</item>
+ <!-- Default value for unknown device -->
+ <item>DEFAULT,10</item>
</string-array>
</resources>
diff --git a/java/res/values/keypress-volumes.xml b/java/res/values/keypress-volumes.xml
index d1120694b..047fe0c5f 100644
--- a/java/res/values/keypress-volumes.xml
+++ b/java/res/values/keypress-volumes.xml
@@ -20,11 +20,13 @@
<resources>
<string-array name="keypress_volumes" translatable="false">
<!-- Build.HARDWARE,volume -->
- <item>herring,0.5</item>
- <item>tuna,0.5</item>
- <item>stingray,0.4</item>
- <item>grouper,0.3</item>
- <item>mako,0.3</item>
- <item>manta,0.2</item>
+ <item>herring,0.5f</item>
+ <item>tuna,0.5f</item>
+ <item>stingray,0.4f</item>
+ <item>grouper,0.3f</item>
+ <item>mako,0.3f</item>
+ <item>manta,0.2f</item>
+ <!-- Default value for unknown device -->
+ <item>DEFAULT,0.2f</item>
</string-array>
</resources>
diff --git a/java/res/values/phantom-sudden-move-event-device-list.xml b/java/res/values/phantom-sudden-move-event-device-list.xml
index 63d12e96e..22f510229 100644
--- a/java/res/values/phantom-sudden-move-event-device-list.xml
+++ b/java/res/values/phantom-sudden-move-event-device-list.xml
@@ -21,6 +21,9 @@
<string-array name="phantom_sudden_move_event_device_list" translatable="false">
<!-- "Build.HARDWARE,true" that needs "phantom sudden move event" hack.
See {@link com.android.inputmethod.keyboard.PointerTracker}. -->
- <item>stingray,true</item> <!-- Xoom -->
+ <!-- Xoom -->
+ <item>stingray,true</item>
+ <!-- Default value for unknown device -->
+ <item>DEFAULT,false</item>
</string-array>
</resources>
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 2affdebed..5c5442708 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -76,6 +76,9 @@
<!-- Description for delay for dismissing a popup on screen: default value of the delay [CHAR LIMIT=15] -->
<string name="key_preview_popup_dismiss_default_delay">Default</string>
+ <!-- Units abbreviation for the keypress vibration duration (milliseconds) [CHAR LIMIT=10] -->
+ <string name="settings_keypress_vibration_duration"><xliff:g id="milliseconds">%s</xliff:g>ms</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>
<!-- Description for option enabling or disabling the use of names of people in Contacts for suggestion and correction [CHAR LIMIT=65] -->
diff --git a/java/res/values/sudden-jumping-touch-event-device-list.xml b/java/res/values/sudden-jumping-touch-event-device-list.xml
index 543992a81..3fdc0c7e3 100644
--- a/java/res/values/sudden-jumping-touch-event-device-list.xml
+++ b/java/res/values/sudden-jumping-touch-event-device-list.xml
@@ -21,7 +21,11 @@
<string-array name="sudden_jumping_touch_event_device_list" translatable="false">
<!-- "Build.HARDWARE,true" that needs "sudden jump touch event" hack.
See {@link com.android.inputmethod.keyboard.SuddenJumpingTouchEventHandler}. -->
- <item>mahimahi,true</item> <!-- Nexus One -->
- <item>sholes,true</item> <!-- Droid -->
+ <!-- Nexus One -->
+ <item>mahimahi,true</item>
+ <!-- Droid -->
+ <item>sholes,true</item>
+ <!-- Default value for unknown device -->
+ <item>DEFAULT,false</item>
</string-array>
</resources>