diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/values/dictionary-pack.xml | 4 | ||||
| -rw-r--r-- | java/res/values/donottranslate.xml | 7 | ||||
| -rw-r--r-- | java/res/values/keypress-vibration-durations.xml | 8 | ||||
| -rw-r--r-- | java/res/xml/prefs.xml | 9 |
4 files changed, 15 insertions, 13 deletions
diff --git a/java/res/values/dictionary-pack.xml b/java/res/values/dictionary-pack.xml index 4109bcb95..3fdc67132 100644 --- a/java/res/values/dictionary-pack.xml +++ b/java/res/values/dictionary-pack.xml @@ -20,4 +20,8 @@ <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> <string name="dictionary_pack_client_id" translatable="false">com.android.inputmethod.latin</string> <string name="dictionary_pack_metadata_uri" translatable="false"></string> + <string name="dictionary_pack_settings_activity">com.android.inputmethod.dictionarypack.DictionarySettingsActivity</string> + <string name="authority">com.android.inputmethod.dictionarypack.aosp</string> + <string name="default_metadata_uri"></string> + <string name="local_metadata_filename">metadata.json</string> </resources> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 1e70fbbba..d2554ee5f 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -211,11 +211,4 @@ </string-array> <string name="settings_warning_researcher_mode">Attention! You are using the special keyboard for research purposes.</string> - - <!-- dictionary pack settings --> - <string name="dictionary_pack_settings_activity">com.android.inputmethod.dictionarypack.DictionarySettingsActivity</string> - <string name="authority">com.android.inputmethod.dictionarypack.aosp</string> - <string name="default_metadata_uri"></string> - <string name="local_metadata_filename">metadata.json</string> - </resources> 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" /> |