aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2013-05-30 23:49:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-30 23:49:07 -0700
commit70c2dcffa3fdce8040d0779dd173d5634e434cba (patch)
tree1ed9b4e2d16932b83ee97c6630618bcb78d12d22 /java
parent5989c9b8100615fd77d9cb75a63ea707e411da8a (diff)
parent6f7e39a6827598492ffbfeedf4c47445519f272e (diff)
downloadlatinime-70c2dcffa3fdce8040d0779dd173d5634e434cba.tar.gz
latinime-70c2dcffa3fdce8040d0779dd173d5634e434cba.tar.xz
latinime-70c2dcffa3fdce8040d0779dd173d5634e434cba.zip
am 6f7e39a6: am e7514a6a: Merge "Add vibration override values for Galaxy S4 and HTC One" into jb-mr2-dev
* commit '6f7e39a6827598492ffbfeedf4c47445519f272e': Add vibration override values for Galaxy S4 and HTC One
Diffstat (limited to 'java')
-rw-r--r--java/res/values/keypress-vibration-durations.xml9
1 files changed, 9 insertions, 0 deletions
diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml
index ad6beadb6..0474b1c92 100644
--- a/java/res/values/keypress-vibration-durations.xml
+++ b/java/res/values/keypress-vibration-durations.xml
@@ -39,10 +39,19 @@
<item>MODEL=(SAMSUNG-)?SCH-(J021|R530|I535|I939):MANUFACTURER=samsung,8</item>
<item>MODEL=(SAMSUNG-)?(SCL21|SC-06D|SC-03E):MANUFACTURER=samsung,8</item>
<item>MODEL=(SAMSUNG-)?(SHV-210[KLS]?|SPH-L710):MANUFACTURER=samsung,8</item>
+ <!-- Samsung Galaxy S4 -->
+ <item>MODEL=(SAMSUNG-)?GT-I(950[0258][G]?):MANUFACTURER=samsung,7</item>
+ <item>MODEL=(SAMSUNG-)?SGH-(I337|M919|N045):MANUFACTURER=samsung,7</item>
+ <item>MODEL=(SAMSUNG-)?SCH-(I545|I959|R970):MANUFACTURER=samsung,7</item>
+ <item>MODEL=(SAMSUNG-)?SPH-(L720):MANUFACTURER=samsung,7</item>
+ <item>MODEL=(SAMSUNG-)?(SC-04E):MANUFACTURER=samsung,7</item>
+ <item>MODEL=(SAMSUNG-)?(SHV-E300[KLS]?):MANUFACTURER=samsung,7</item>
<!-- LG Optimus G -->
<item>MODEL=LG-E97[013]|LS970|L-01E:MANUFACTURER=LGE,15</item>
<!-- HTC One X -->
<item>MODEL=HTC One X:MANUFACTURER=HTC,20</item>
+ <!-- HTC One -->
+ <item>MODEL=HTC One:MANUFACTURER=HTC,15</item>
<!-- Motorola Razor M -->
<item>MODEL=XT907:MANUFACTURER=motorola,30</item>
<!-- Sony Xperia Z -->