am cd692be1: Merge "Change the default vibration duration to 20msec"

* commit 'cd692be1e1151c233d0605d5f8eabbf5c3f2b1ab':
  Change the default vibration duration to 20msec
This commit is contained in:
Tadashi G. Takaoka 2013-04-11 01:18:43 -07:00 committed by Android Git Automerger
commit 3d6b743189

View file

@ -18,13 +18,17 @@
*/ */
--> -->
<resources> <resources>
<string-array name="keypress_vibration_durations" translatable="false">
<!-- Build.HARDWARE,duration_in_milliseconds --> <!-- Build.HARDWARE,duration_in_milliseconds -->
<string-array name="keypress_vibration_durations" translatable="false">
<!-- Nexus S -->
<item>herring,5</item> <item>herring,5</item>
<!-- Galaxy Nexus -->
<item>tuna,5</item> <item>tuna,5</item>
<!-- Nexus 4 -->
<item>mako,5</item> <item>mako,5</item>
<!-- Nexus 10 -->
<item>manta,16</item> <item>manta,16</item>
<!-- Default value for unknown device --> <!-- Default value for unknown device -->
<item>DEFAULT,10</item> <item>DEFAULT,20</item>
</string-array> </string-array>
</resources> </resources>