nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am af69a14c: Use system default vibration pattern 

* commit 'af69a14c9684ef6f7a14e60cb635f96db530f6e7':
  Use system default vibration pattern
main
Tadashi G. Takaoka 2013-06-18 08:56:09 -07:00 committed by Android Git Automerger
parent 0cae172563 af69a14c96
commit 7c1c4f3544
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/res/values/keypress-vibration-durations.xml
View File

@ -56,7 +56,7 @@
<item>MODEL=XT907:MANUFACTURER=motorola,30</item> <item>MODEL=XT907:MANUFACTURER=motorola,30</item>
<!-- Sony Xperia Z --> <!-- Sony Xperia Z -->
<item>MODEL=C6603:MANUFACTURER=Sony,35</item> <item>MODEL=C6603:MANUFACTURER=Sony,35</item>
<!-- Default value for unknown device --> <!-- Default value for unknown device. The negative value means system default. -->
<item>,20</item> <item>,-1</item>
</string-array> </string-array>
</resources> </resources>

2
java/res/values/strings.xml
View File

@ -79,6 +79,8 @@
<!-- Units abbreviation for the duration (milliseconds) [CHAR LIMIT=10] --> <!-- Units abbreviation for the duration (milliseconds) [CHAR LIMIT=10] -->
<string name="abbreviation_unit_milliseconds"><xliff:g id="milliseconds">%s</xliff:g>ms</string> <string name="abbreviation_unit_milliseconds"><xliff:g id="milliseconds">%s</xliff:g>ms</string>
<!-- The text that represents the current settings value is the system default [CHAR LIMIT=20] -->
<string name="settings_system_default">System default</string>
<!-- Option name for enabling or disabling the use of names of people in Contacts for suggestion and correction [CHAR LIMIT=25] --> <!-- Option name for enabling or disabling the use of names of people in Contacts for suggestion and correction [CHAR LIMIT=25] -->
<string name="use_contacts_dict">Suggest Contact names</string> <string name="use_contacts_dict">Suggest Contact names</string>

3
java/src/com/android/inputmethod/latin/SettingsFragment.java
View File

@ -367,6 +367,9 @@ public final class SettingsFragment extends InputMethodSettingsFragment
@Override @Override
public String getValueText(final int value) { public String getValueText(final int value) {
if (value < 0) {
return res.getString(R.string.settings_system_default);
}
return res.getString(R.string.abbreviation_unit_milliseconds, value); return res.getString(R.string.abbreviation_unit_milliseconds, value);
} }
}); });