diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2013-05-13 06:13:20 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-05-13 06:13:20 +0000 |
| commit | ec83457d726679e81d0b0ec12c9e7a284464133e (patch) | |
| tree | b3f4f3eb14cec38d0866aab3aa26246d95a25c7e /java/res | |
| parent | cb3bba3c4ee4652e12c81185ab9a648db20bb0dd (diff) | |
| parent | d69fa0a09af7e9a524751dac1522c951abd92530 (diff) | |
| download | latinime-ec83457d726679e81d0b0ec12c9e7a284464133e.tar.gz latinime-ec83457d726679e81d0b0ec12c9e7a284464133e.tar.xz latinime-ec83457d726679e81d0b0ec12c9e7a284464133e.zip | |
Merge "Support multiple condition for getDeviceOverrideValue"
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/keyboard-heights.xml | 2 | ||||
| -rw-r--r-- | java/res/values/keypress-vibration-durations.xml | 2 | ||||
| -rw-r--r-- | java/res/values/keypress-volumes.xml | 2 | ||||
| -rw-r--r-- | java/res/values/phantom-sudden-move-event-device-list.xml | 2 | ||||
| -rw-r--r-- | java/res/values/sudden-jumping-touch-event-device-list.xml | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/java/res/values/keyboard-heights.xml b/java/res/values/keyboard-heights.xml index 1c0277c2c..c651a89b3 100644 --- a/java/res/values/keyboard-heights.xml +++ b/java/res/values/keyboard-heights.xml @@ -34,6 +34,6 @@ <!-- Xoom --> <item>HARDWARE=stingray,283.1337</item> <!-- Default value for unknown device: empty string --> - <item>DEFAULT,</item> + <item>,</item> </string-array> </resources> diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml index 45c51e71b..53aad72b7 100644 --- a/java/res/values/keypress-vibration-durations.xml +++ b/java/res/values/keypress-vibration-durations.xml @@ -29,6 +29,6 @@ <!-- Nexus 10 --> <item>HARDWARE=manta,16</item> <!-- Default value for unknown device --> - <item>DEFAULT,20</item> + <item>,20</item> </string-array> </resources> diff --git a/java/res/values/keypress-volumes.xml b/java/res/values/keypress-volumes.xml index 7061f1310..a096c341b 100644 --- a/java/res/values/keypress-volumes.xml +++ b/java/res/values/keypress-volumes.xml @@ -27,6 +27,6 @@ <item>HARDWARE=mako,0.3f</item> <item>HARDWARE=manta,0.2f</item> <!-- Default value for unknown device --> - <item>DEFAULT,0.2f</item> + <item>,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 d0895b158..53002b31e 100644 --- a/java/res/values/phantom-sudden-move-event-device-list.xml +++ b/java/res/values/phantom-sudden-move-event-device-list.xml @@ -24,6 +24,6 @@ <!-- Xoom --> <item>HARDWARE=stingray,true</item> <!-- Default value for unknown device --> - <item>DEFAULT,false</item> + <item>,false</item> </string-array> </resources> 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 73e30c17d..3a9c379a7 100644 --- a/java/res/values/sudden-jumping-touch-event-device-list.xml +++ b/java/res/values/sudden-jumping-touch-event-device-list.xml @@ -26,6 +26,6 @@ <!-- Droid --> <item>HARDWARE=sholes,true</item> <!-- Default value for unknown device --> - <item>DEFAULT,false</item> + <item>,false</item> </string-array> </resources> |