diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/arrays.xml | 34 | ||||
| -rw-r--r-- | res/values/strings.xml | 6 | ||||
| -rw-r--r-- | res/xml/settings.xml | 6 |
3 files changed, 29 insertions, 17 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 8983820..70143bb 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -112,16 +112,26 @@ <item>30</item> <item>15</item> </string-array> - <string-array name="pref_clipboard_duration_entries"> - <item>@string/pref_clipboard_history_duration_1</item> - <item>@string/pref_clipboard_history_duration_5</item> - <item>@string/pref_clipboard_history_duration_30</item> - <item>@string/pref_clipboard_history_duration_stop</item> - </string-array> - <string-array name="pref_clipboard_duration_values"> - <item>1</item> - <item>5</item> - <item>30</item> - <item>-1</item> - </string-array> + <string-array name="pref_clipboard_duration_entries"> + <item>@string/pref_clipboard_history_duration_1</item> + <item>@string/pref_clipboard_history_duration_5</item> + <item>@string/pref_clipboard_history_duration_30</item> + <item>@string/pref_clipboard_history_duration_stop</item> + </string-array> + <string-array name="pref_clipboard_duration_values"> + <item>1</item> + <item>5</item> + <item>30</item> + <item>-1</item> + </string-array> + <string-array name="pref_change_method_key_replacement_entries"> + <item>@string/pref_change_method_key_replacement_e_picker</item> + <item>@string/pref_change_method_key_replacement_e_prev</item> + <item>@string/pref_change_method_key_replacement_e_next</item> + </string-array> + <string-array name="pref_change_method_key_replacement_values"> + <item>picker</item> + <item>prev</item> + <item>next</item> + </string-array> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0a7faf4..6b1c329 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -44,8 +44,10 @@ <string name="pref_category_behavior">Behavior</string> <string name="pref_autocapitalisation_title">Automatic capitalisation</string> <string name="pref_autocapitalisation_summary">Press Shift at the beginning of a sentence</string> - <string name="pref_switch_input_immediate_title">Switch to the last used keyboard</string> - <string name="pref_switch_input_immediate_summary">Behavior of the keyboard-switching key</string> + <string name="pref_change_method_key_replacement_title">Switching between input methods</string> + <string name="pref_change_method_key_replacement_e_picker">Show the input method picker (long press)</string> + <string name="pref_change_method_key_replacement_e_prev">Switch to last used</string> + <string name="pref_change_method_key_replacement_e_next">Switch to the next in the list</string> <string name="pref_vibrate_custom">Custom vibration</string> <string name="pref_vibrate_duration_title">Vibration intensity</string> <string name="pref_number_entry_title">Layout when typing numbers, dates, and phone numbers</string> diff --git a/res/xml/settings.xml b/res/xml/settings.xml index c96f546..175617a 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -23,7 +23,7 @@ </PreferenceCategory> <PreferenceCategory android:title="@string/pref_category_behavior"> <CheckBoxPreference android:key="autocapitalisation" android:title="@string/pref_autocapitalisation_title" android:summary="@string/pref_autocapitalisation_summary" android:defaultValue="true"/> - <CheckBoxPreference android:key="switch_input_immediate" android:title="@string/pref_switch_input_immediate_title" android:summary="@string/pref_switch_input_immediate_summary" android:defaultValue="false"/> + <ListPreference android:key="change_method_key_replacement" android:title="@string/pref_change_method_key_replacement_title" android:summary="%s" android:entries="@array/pref_change_method_key_replacement_entries" android:entryValues="@array/pref_change_method_key_replacement_values" android:defaultValue="prev"/> <CheckBoxPreference android:key="vibrate_custom" android:title="@string/pref_vibrate_custom" android:defaultValue="false"/> <juloo.keyboard2.prefs.IntSlideBarPreference android:dependency="vibrate_custom" android:key="vibrate_duration" android:title="@string/pref_vibrate_duration_title" android:summary="%sms" android:defaultValue="20" min="0" max="100"/> <ListPreference android:key="number_entry_layout" android:title="@string/pref_number_entry_title" android:summary="%s" android:defaultValue="pin" android:entries="@array/pref_number_entry_entries" android:entryValues="@array/pref_number_entry_values"/> @@ -60,6 +60,6 @@ <juloo.keyboard2.prefs.SlideBarPreference android:key="custom_border_line_width" android:title="@string/pref_border_width_title" android:summary="%sdp" android:defaultValue="0" min="0" max="5" android:dependency="border_config"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_category_clipboard"> - <ListPreference android:key="clipboard_history_duration" android:title="@string/pref_clipboard_history_duration" android:summary="%s" android:defaultValue="5" android:entries="@array/pref_clipboard_duration_entries" android:entryValues="@array/pref_clipboard_duration_values" /> - </PreferenceCategory> + <ListPreference android:key="clipboard_history_duration" android:title="@string/pref_clipboard_history_duration" android:summary="%s" android:defaultValue="5" android:entries="@array/pref_clipboard_duration_entries" android:entryValues="@array/pref_clipboard_duration_values"/> + </PreferenceCategory> </PreferenceScreen> |