From d00576ac2d7605c48034dc52e6622f48f680d4ae Mon Sep 17 00:00:00 2001
From: Jules Aguillon
Date: Wed, 28 Apr 2021 00:23:52 +0200
Subject: Add the "layout" option again

Some versions of android don't allow to configure several languages.
---
 res/values/arrays.xml  |  9 +++++----
 res/values/strings.xml | 11 +++++++++--
 res/xml/method.xml     |  2 ++
 res/xml/settings.xml   |  8 ++++++++
 4 files changed, 24 insertions(+), 6 deletions(-)

(limited to 'res')

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 896c515..c6e2139 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string-array name="pref_layout_values">
-		<item>azerty</item>
-		<item>qwerty</item>
-	</string-array>
+  <string-array name="pref_layout_values">
+    <item>system</item>
+    <item>azerty</item>
+    <item>qwerty</item>
+  </string-array>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9637b57..04c3b57 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5,10 +5,17 @@
 
 	<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="subtype_label_azerty">%s</string>
+  <string name="subtype_label_qwerty">%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_disable_accent_keys_title">Toggle accent keys</string>
 	<string name="pref_disable_accent_keys_summary">Whether to remove the accent keys from the keyboard</string>
 
diff --git a/res/xml/method.xml b/res/xml/method.xml
index 92c02ff..5a515cd 100644
--- a/res/xml/method.xml
+++ b/res/xml/method.xml
@@ -7,11 +7,13 @@
       android:imeSubtypeLocale="en_US"
       android:imeSubtypeMode="keyboard"
       android:isAsciiCapable="true"
+      android:imeSubtypeExtraValue="default_layout=qwerty"
     />
   <subtype android:label="@string/subtype_label_azerty"
       android:languageTag="fr"
       android:imeSubtypeLocale="fr_FR"
       android:imeSubtypeMode="keyboard"
       android:isAsciiCapable="true"
+      android:imeSubtypeExtraValue="default_layout=azerty"
     />
 </input-method>
diff --git a/res/xml/settings.xml b/res/xml/settings.xml
index d56f029..f943557 100644
--- a/res/xml/settings.xml
+++ b/res/xml/settings.xml
@@ -1,6 +1,14 @@
 <?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" />
+    />
     <CheckBoxPreference
       android:key="disable_accent_keys"
       android:title="@string/pref_disable_accent_keys_title"
-- 
cgit v1.2.3