diff options
| author | Jules Aguillon | 2021-04-15 23:56:34 +0200 |
|---|---|---|
| committer | Jules Aguillon | 2021-04-15 23:56:34 +0200 |
| commit | ca07bff1330024bd78e28d1bc83940daab678fbb (patch) | |
| tree | 784c839b541f9fc78bdeb2fce018ea0ca15b40a4 /res | |
| parent | c22ca7302c16773dbe1971323034dd6e23d9611b (diff) | |
| download | unexpected-keyboard-ca07bff1330024bd78e28d1bc83940daab678fbb.tar.gz unexpected-keyboard-ca07bff1330024bd78e28d1bc83940daab678fbb.zip | |
Use subtypes to choose layout
This removes the "layout" setting. Every layouts that the user could use
will appear in the global settings.
Diffstat (limited to 'res')
| -rw-r--r-- | res/values/strings.xml | 9 | ||||
| -rw-r--r-- | res/xml/method.xml | 12 | ||||
| -rw-r--r-- | res/xml/settings.xml | 8 |
3 files changed, 15 insertions, 14 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index db45f85..e53b4b6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -5,13 +5,10 @@ <string name="settings_activity_label">Unexpected Keyboard Settings</string> + <string name="subtype_label_azerty">%s AZERTY</string> + <string name="subtype_label_qwerty">%s QWERTY</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>Azerty</item> - <item>Qwerty</item> - </string-array> <string name="pref_category_typing">Typing</string> <string name="pref_preci_title">Precision</string> diff --git a/res/xml/method.xml b/res/xml/method.xml index 63887e3..f13eecc 100644 --- a/res/xml/method.xml +++ b/res/xml/method.xml @@ -2,4 +2,16 @@ <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_azerty" + android:languageTag="fr" + android:imeSubtypeLocale="fr_FR" + android:imeSubtypeMode="keyboard" + android:isAsciiCapable="true" + /> + <subtype android:label="@string/subtype_label_qwerty" + android:languageTag="en" + android:imeSubtypeLocale="en_US" + android:imeSubtypeMode="keyboard" + android:isAsciiCapable="true" + /> </input-method> diff --git a/res/xml/settings.xml b/res/xml/settings.xml index a4cf7ff..8c37179 100644 --- a/res/xml/settings.xml +++ b/res/xml/settings.xml @@ -1,14 +1,6 @@ <?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="keyboard_layout" - android:title="@string/pref_layout_title" - android:summary="@string/pref_layout_summary" - android:defaultValue="azerty" - android:entries="@array/pref_layout_entries" - android:entryValues="@array/pref_layout_values" - /> <CheckBoxPreference android:key="disable_accent_keys" android:title="@string/pref_disable_accent_keys_title" |