diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/keypress-vibration-durations.xml | 8 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/java/res/values/keypress-vibration-durations.xml b/java/res/values/keypress-vibration-durations.xml index 9b1d5431e..10400be83 100644 --- a/java/res/values/keypress-vibration-durations.xml +++ b/java/res/values/keypress-vibration-durations.xml @@ -18,13 +18,17 @@ */ --> <resources> + <!-- Build.HARDWARE,duration_in_milliseconds --> <string-array name="keypress_vibration_durations" translatable="false"> - <!-- Build.HARDWARE,duration_in_milliseconds --> + <!-- Nexus S --> <item>herring,5</item> + <!-- Galaxy Nexus --> <item>tuna,5</item> + <!-- Nexus 4 --> <item>mako,5</item> + <!-- Nexus 10 --> <item>manta,16</item> <!-- Default value for unknown device --> - <item>DEFAULT,10</item> + <item>DEFAULT,20</item> </string-array> </resources> diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml index 783946252..a13021bd0 100644 --- a/java/res/xml/prefs.xml +++ b/java/res/xml/prefs.xml @@ -90,6 +90,7 @@ android:summary="@string/gesture_input_summary" android:persistent="true" android:defaultValue="true" /> + <!-- TODO: Move these two options to the advanced settings. --> <CheckBoxPreference android:key="pref_gesture_floating_preview_text" android:title="@string/gesture_floating_preview_text" @@ -139,10 +140,6 @@ android:summary="@string/include_other_imes_in_language_switch_list_summary" android:persistent="true" android:defaultValue="false" /> - <PreferenceScreen - android:fragment="com.android.inputmethod.latin.AdditionalSubtypeSettings" - android:key="custom_input_styles" - android:title="@string/custom_input_styles_title" /> <!-- Values for popup dismiss delay are added programmatically --> <CheckBoxPreference android:key="pref_sliding_key_input_preview" @@ -150,6 +147,10 @@ android:summary="@string/sliding_key_input_preview_summary" android:persistent="true" android:defaultValue="true" /> + <PreferenceScreen + android:fragment="com.android.inputmethod.latin.AdditionalSubtypeSettings" + android:key="custom_input_styles" + android:title="@string/custom_input_styles_title" /> <ListPreference android:key="pref_key_preview_popup_dismiss_delay" android:title="@string/key_preview_popup_dismiss_delay" /> |