diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-02-09 21:53:37 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-02-09 21:53:37 -0800 |
| commit | 4ed37fface9f53767a3f4cde22916e033a9e8bfd (patch) | |
| tree | 3eaab2257937872d8e614d743de0bb3311bdb74a /java/res | |
| parent | 20083cce070a8544a3973dcfc6609e1bcf0abac8 (diff) | |
| parent | cbb0a6de3b3ef0afad604bc2b62319d47b6e2f5d (diff) | |
| download | latinime-4ed37fface9f53767a3f4cde22916e033a9e8bfd.tar.gz latinime-4ed37fface9f53767a3f4cde22916e033a9e8bfd.tar.xz latinime-4ed37fface9f53767a3f4cde22916e033a9e8bfd.zip | |
am cbb0a6de: Merge "Fix possible NPE while finding device override value from resource"
* commit 'cbb0a6de3b3ef0afad604bc2b62319d47b6e2f5d':
Fix possible NPE while finding device override value from resource
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values-land/keyboard-heights.xml | 2 | ||||
| -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 |
5 files changed, 0 insertions, 10 deletions
diff --git a/java/res/values-land/keyboard-heights.xml b/java/res/values-land/keyboard-heights.xml index 670be3329..d57f96be3 100644 --- a/java/res/values-land/keyboard-heights.xml +++ b/java/res/values-land/keyboard-heights.xml @@ -33,7 +33,5 @@ <!-- Preferable keyboard height in absolute scale: 45.0mm --> <!-- Xoom --> <item>HARDWARE=stingray,265.4378</item> - <!-- Default value for unknown device: empty string --> - <item>,</item> </string-array> </resources> diff --git a/java/res/values/keyboard-heights.xml b/java/res/values/keyboard-heights.xml index c651a89b3..12dd51d9d 100644 --- a/java/res/values/keyboard-heights.xml +++ b/java/res/values/keyboard-heights.xml @@ -33,7 +33,5 @@ <!-- Preferable keyboard height in absolute scale: 48.0mm --> <!-- Xoom --> <item>HARDWARE=stingray,283.1337</item> - <!-- Default value for unknown device: empty string --> - <item>,</item> </string-array> </resources> diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml index cde4e4447..032b5fd91 100644 --- a/java/res/values/keypress-vibration-durations.xml +++ b/java/res/values/keypress-vibration-durations.xml @@ -59,7 +59,5 @@ <item>MODEL=XT1035:MANUFACTURER=motorola,18</item> <!-- Sony Xperia Z, Z Ultra --> <item>MODEL=C6603|C6806:MANUFACTURER=Sony,35</item> - <!-- Default value for unknown device. The negative value means system default. --> - <item>,-1</item> </string-array> </resources> diff --git a/java/res/values/keypress-volumes.xml b/java/res/values/keypress-volumes.xml index d359055c2..074581d00 100644 --- a/java/res/values/keypress-volumes.xml +++ b/java/res/values/keypress-volumes.xml @@ -26,7 +26,5 @@ <item>HARDWARE=grouper,0.3f</item> <item>HARDWARE=mako,0.3f</item> <item>HARDWARE=manta,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/res/values/phantom-sudden-move-event-device-list.xml b/java/res/values/phantom-sudden-move-event-device-list.xml index 53002b31e..4f91cd389 100644 --- a/java/res/values/phantom-sudden-move-event-device-list.xml +++ b/java/res/values/phantom-sudden-move-event-device-list.xml @@ -23,7 +23,5 @@ See {@link com.android.inputmethod.keyboard.PointerTracker}. --> <!-- Xoom --> <item>HARDWARE=stingray,true</item> - <!-- Default value for unknown device --> - <item>,false</item> </string-array> </resources> |