aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorJason Chen <jasonchen@google.com>2012-08-29 15:43:19 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-29 15:43:19 -0700
commitb001fa535bad8fb1ac5571dac959b52c8499fd2b (patch)
tree48ddcca92953d10b95212e1f29f7031ceef1246b /java
parent775f27c88180bd9bf875c0c76b32cfe2cab9da59 (diff)
parent85cb45c80ff4d4815dca742262f85075a6ec4565 (diff)
downloadlatinime-b001fa535bad8fb1ac5571dac959b52c8499fd2b.tar.gz
latinime-b001fa535bad8fb1ac5571dac959b52c8499fd2b.tar.xz
latinime-b001fa535bad8fb1ac5571dac959b52c8499fd2b.zip
am 85cb45c8: Merge "Add defaults for manta" into jb-mr1-dev
* commit '85cb45c80ff4d4815dca742262f85075a6ec4565': Add defaults for manta
Diffstat (limited to 'java')
-rw-r--r--java/res/values/keypress-vibration-durations.xml1
-rw-r--r--java/res/values/keypress-volumes.xml1
2 files changed, 2 insertions, 0 deletions
diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml
index 8f6b647b7..1d7e57bce 100644
--- a/java/res/values/keypress-vibration-durations.xml
+++ b/java/res/values/keypress-vibration-durations.xml
@@ -23,5 +23,6 @@
<item>herring,5</item>
<item>tuna,5</item>
<item>mako,20</item>
+ <item>manta,16</item>
</string-array>
</resources>
diff --git a/java/res/values/keypress-volumes.xml b/java/res/values/keypress-volumes.xml
index dd86d6c38..d1120694b 100644
--- a/java/res/values/keypress-volumes.xml
+++ b/java/res/values/keypress-volumes.xml
@@ -25,5 +25,6 @@
<item>stingray,0.4</item>
<item>grouper,0.3</item>
<item>mako,0.3</item>
+ <item>manta,0.2</item>
</string-array>
</resources>