diff options
| -rw-r--r-- | res/values/arrays.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 16 | ||||
| -rw-r--r-- | res/xml/method.xml | 10 | ||||
| -rw-r--r-- | res/xml/settings.xml | 18 |
4 files changed, 20 insertions, 31 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml index ae5fbd6..d8c83f1 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -5,7 +5,11 @@ <item>azerty</item> <item>qwerty</item> </string-array> - <string name="pref_accents_default">1</string> + <string-array name="pref_layout_entries"> + <item>@string/pref_layout_e_system</item> + <item>AZERTY</item> + <item>QWERTY</item> + </string-array> <string-array name="pref_accents_entries"> <item>@string/pref_accents_e_all_installed</item> <item>@string/pref_accents_e_selected</item> @@ -23,7 +27,6 @@ <item>@string/pref_theme_e_light</item> <item>@string/pref_theme_e_black</item> </string-array> - <string name="pref_theme_default">dark</string> <string-array name="pref_theme_values"> <item>dark</item> <item>light</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index 36019ca..b41fdc5 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -2,17 +2,10 @@ <resources> <string name="app_name">Unexpected Keyboard</string> <string name="settings_activity_label">Unexpected Keyboard Settings</string> - <string name="subtype_label">%s</string> <string name="pref_category_layout">Layout</string> <string name="pref_layout_title">Change keyboard layout</string> - <string name="pref_layout_summary">%s</string> - <string-array name="pref_layout_entries"> - <item>System settings</item> - <item>Azerty</item> - <item>Qwerty</item> - </string-array> + <string name="pref_layout_e_system">System settings</string> <string name="pref_accents_title">Accents</string> - <string name="pref_accents_summary">%s</string> <string name="pref_accents_e_all_installed">Show accents for all the installed languages</string> <string name="pref_accents_e_selected">Show accents for the selected language</string> <string name="pref_accents_e_all">Show every accents</string> @@ -21,27 +14,20 @@ <string name="pref_preci_title">Precision</string> <string name="pref_preci_summary">Distance of corner values (%spx)</string> <string name="pref_long_timeout_title">Long press timeout</string> - <string name="pref_long_timeout_summary">%sms</string> <string name="pref_long_interval_title">Long press interval</string> - <string name="pref_long_interval_summary">%sms</string> <string name="pref_category_vibrate">Vibration</string> <string name="pref_vibrate_title">Vibration</string> <string name="pref_vibrate_summary">Enable/Disable vibrations on key down</string> <string name="pref_vibrate_duration_title">Duration</string> - <string name="pref_vibrate_duration_summary">%sms</string> <string name="pref_precise_repeat_title">Precise cursor movements</string> <string name="pref_precise_repeat_summary">Modulate the speed of movements by swiping more or less</string> <string name="pref_category_style">Style</string> <string name="pref_margin_bottom_title">Margin bottom</string> - <string name="pref_margin_bottom_summary">%sdp</string> <string name="pref_key_height_title">Key height</string> - <string name="pref_key_height_summary">%sdp</string> <string name="pref_horizontal_margin_title">Horizontal margin</string> - <string name="pref_horizontal_margin_summary">%sdp</string> <string name="pref_character_size_title">Label size</string> <string name="pref_character_size_summary">Size of characters displayed on the keyboard (%.2fx)</string> <string name="pref_theme">Theme</string> - <string name="pref_theme_summary">%s</string> <string name="pref_theme_e_dark">Dark</string> <string name="pref_theme_e_light">Light</string> <string name="pref_theme_e_black">Black</string> diff --git a/res/xml/method.xml b/res/xml/method.xml index 30097e2..4aa79df 100644 --- a/res/xml/method.xml +++ b/res/xml/method.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <input-method xmlns:android="http://schemas.android.com/apk/res/android" android:settingsActivity="juloo.keyboard2.SettingsActivity" android:supportsSwitchingToNextInputMethod="true"> - <subtype android:label="@string/subtype_label" android:languageTag="en" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty"/> - <subtype android:label="@string/subtype_label" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,accents=grave|aigu|circonflexe|cedille|trema"/> - <subtype android:label="@string/subtype_label" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,accents=aigu|tilde|trema"/> - <subtype android:label="@string/subtype_label" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,accents=grave|aigu"/> - <subtype android:label="@string/subtype_label" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,accents=aigu|trema|ring"/> + <subtype android:label="%s" android:languageTag="en" android:imeSubtypeLocale="en_US" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty"/> + <subtype android:label="%s" android:languageTag="fr" android:imeSubtypeLocale="fr_FR" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=azerty,accents=grave|aigu|circonflexe|cedille|trema"/> + <subtype android:label="%s" android:languageTag="es" android:imeSubtypeLocale="es_ES" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,accents=aigu|tilde|trema"/> + <subtype android:label="%s" android:languageTag="it" android:imeSubtypeLocale="it_IT" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,accents=grave|aigu"/> + <subtype android:label="%s" android:languageTag="sv" android:imeSubtypeLocale="sv_SE" android:imeSubtypeMode="keyboard" android:isAsciiCapable="true" android:imeSubtypeExtraValue="default_layout=qwerty,accents=aigu|trema|ring"/> </input-method> diff --git a/res/xml/settings.xml b/res/xml/settings.xml index 8561717..94c96d6 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -1,24 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory android:title="@string/pref_category_layout"> - <ListPreference android:key="layout" android:title="@string/pref_layout_title" android:summary="@string/pref_layout_summary" android:defaultValue="system" android:entries="@array/pref_layout_entries" android:entryValues="@array/pref_layout_values"/> - <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="@string/pref_accents_summary" android:defaultValue="@string/pref_accents_default" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/> + <ListPreference android:key="layout" android:title="@string/pref_layout_title" android:summary="%s" android:defaultValue="system" android:entries="@array/pref_layout_entries" android:entryValues="@array/pref_layout_values"/> + <ListPreference android:key="accents" android:title="@string/pref_accents_title" android:summary="%s" android:defaultValue="1" android:entries="@array/pref_accents_entries" android:entryValues="@array/pref_accents_values"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_category_typing"> <juloo.common.SlideBarPreference android:key="sub_value_dist" android:title="@string/pref_preci_title" android:summary="@string/pref_preci_summary" android:defaultValue="10.0" min="5.0" max="25.0"/> - <juloo.common.IntSlideBarPreference android:key="longpress_timeout" android:title="@string/pref_long_timeout_title" android:summary="@string/pref_long_timeout_summary" android:defaultValue="600" min="50" max="2000"/> - <juloo.common.IntSlideBarPreference android:key="longpress_interval" android:title="@string/pref_long_interval_title" android:summary="@string/pref_long_interval_summary" android:defaultValue="25" min="5" max="100"/> + <juloo.common.IntSlideBarPreference android:key="longpress_timeout" android:title="@string/pref_long_timeout_title" android:summary="%sms" android:defaultValue="600" min="50" max="2000"/> + <juloo.common.IntSlideBarPreference android:key="longpress_interval" android:title="@string/pref_long_interval_title" android:summary="%sms" android:defaultValue="25" min="5" max="100"/> <CheckBoxPreference android:key="precise_repeat" android:title="@string/pref_precise_repeat_title" android:summary="@string/pref_precise_repeat_summary" android:defaultValue="true"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_category_vibrate"> <CheckBoxPreference android:key="vibrate_enabled" android:title="@string/pref_vibrate_title" android:summary="@string/pref_vibrate_summary" android:defaultValue="true"/> - <juloo.common.IntSlideBarPreference android:key="vibrate_duration" android:title="@string/pref_vibrate_duration_title" android:summary="@string/pref_vibrate_duration_summary" android:defaultValue="20" min="5" max="50"/> + <juloo.common.IntSlideBarPreference android:key="vibrate_duration" android:title="@string/pref_vibrate_duration_title" android:summary="%sms" android:defaultValue="20" min="5" max="50"/> </PreferenceCategory> <PreferenceCategory android:title="@string/pref_category_style"> - <ListPreference android:key="theme" android:title="@string/pref_theme" android:summary="@string/pref_theme_summary" android:defaultValue="@string/pref_theme_default" android:entries="@array/pref_theme_entries" android:entryValues="@array/pref_theme_values"/> - <juloo.common.IntSlideBarPreference android:key="margin_bottom" android:title="@string/pref_margin_bottom_title" android:summary="@string/pref_margin_bottom_summary" android:defaultValue="5" min="0" max="100"/> - <juloo.common.IntSlideBarPreference android:key="key_height" android:title="@string/pref_key_height_title" android:summary="@string/pref_key_height_summary" android:defaultValue="50" min="30" max="90"/> - <juloo.common.IntSlideBarPreference android:key="horizontal_margin" android:title="@string/pref_horizontal_margin_title" android:summary="@string/pref_horizontal_margin_summary" android:defaultValue="3" min="0" max="20"/> + <ListPreference android:key="theme" android:title="@string/pref_theme" android:summary="%s" android:defaultValue="dark" android:entries="@array/pref_theme_entries" android:entryValues="@array/pref_theme_values"/> + <juloo.common.IntSlideBarPreference android:key="margin_bottom" android:title="@string/pref_margin_bottom_title" android:summary="%sdp" android:defaultValue="5" min="0" max="100"/> + <juloo.common.IntSlideBarPreference android:key="key_height" android:title="@string/pref_key_height_title" android:summary="%sdp" android:defaultValue="50" min="30" max="90"/> + <juloo.common.IntSlideBarPreference android:key="horizontal_margin" android:title="@string/pref_horizontal_margin_title" android:summary="%sdp" android:defaultValue="3" min="0" max="20"/> <juloo.common.SlideBarPreference android:key="character_size" android:title="@string/pref_character_size_title" android:summary="@string/pref_character_size_summary" android:defaultValue="1.0" min="0.8" max="1.2"/> </PreferenceCategory> </PreferenceScreen> |