Automatically switch to app's layout. #465

4 files changed, 35 insertions, 22 deletions

diff --git a/src/main/res/values/settings_defaults_dont_translate.xml b/src/main/res/values/settings_defaults_dont_translate.xml
index 1bc12513d..c9d912376 100644
--- a/src/main/res/values/settings_defaults_dont_translate.xml
+++ b/src/main/res/values/settings_defaults_dont_translate.xml
@@ -63,6 +63,8 @@
     <bool name="settings_default_allow_suggestions_restart">true</bool>
     <bool name="settings_default_switch_to_alphabet_on_space">true</bool>
 
+    <bool name="settings_default_persistent_layout_per_package_id">true</bool>
+
     <string name="swipe_action_value_shift">shift</string>
     <string name="swipe_action_value_none">none</string>
     <string name="swipe_action_value_next_alphabet">next_alphabet</string>
diff --git a/src/main/res/values/settings_keys_dont_translate.xml b/src/main/res/values/settings_keys_dont_translate.xml
index 7227662c4..36428f642 100644
--- a/src/main/res/values/settings_keys_dont_translate.xml
+++ b/src/main/res/values/settings_keys_dont_translate.xml
@@ -246,7 +246,7 @@
 
     <string name="settings_key_allow_suggestions_restart">settings_key_allow_suggestions_restart</string>
     <string name="settings_key_switch_keyboard_on_space">settings_key_switch_keyboard_on_space</string>
-
+    <string name="settings_key_persistent_layout_per_package_id">settings_key_persistent_layout_per_package_id</string>
 
     <string name="settings_key_first_app_version_installed">settings_key_first_app_version_installed</string>
     <string name="settings_key_first_time_app_installed">settings_key_first_time_app_installed</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index d2c2ef810..ea3a38af4 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -102,11 +102,13 @@
     <string name="custom_sound_volume">Custom key-press volume</string>
 
     <string name="switch_keyboard_on_space">Space switches keyboards</string>
-    <string name="switch_keyboard_on_space_on_summary">Switch from symbols/numbers to alphabet when pressing space
-    </string>
-    <string name="switch_keyboard_on_space_off_summary">Do not switch from symbols/numbers to alphabet when pressing
-        space
-    </string>
+    <string name="switch_keyboard_on_space_on_summary">Switch from symbols/numbers to alphabet when pressing space</string>
+    <string name="switch_keyboard_on_space_off_summary">Do not switch from symbols/numbers to alphabet when pressing space</string>
+
+    <string name="persistent_layout_per_package_id_title">Remember alphabet layout per App</string>
+    <string name="persistent_layout_per_package_id_off_summary">Use the same layout for all Apps.</string>
+    <string name="persistent_layout_per_package_id_on_summary">Automatically switch to the previous layout used in the App.</string>
+
     <string name="one_shot_quick_text_popup">Auto close after key</string>
     <string name="one_shot_quick_text_popup_on_summary">Close Quick-Text popup after pressing a key</string>
     <string name="one_shot_quick_text_popup_off_summary">Keep Quick-Text popup open until Close key is pressed</string>
diff --git a/src/main/res/xml/prefs_addtional_language_prefs.xml b/src/main/res/xml/prefs_addtional_language_prefs.xml
index c4a03b4cb..37a6217d6 100644
--- a/src/main/res/xml/prefs_addtional_language_prefs.xml
+++ b/src/main/res/xml/prefs_addtional_language_prefs.xml
@@ -43,24 +43,33 @@
             android:summaryOff=""
             android:summaryOn="@string/allow_suggestions_restart_summary"
             android:title="@string/allow_suggestions_restart"/>
-    </PreferenceCategory>
 
 
-    <CheckBoxPreference
-        android:defaultValue="@bool/settings_default_switch_to_alphabet_on_space"
-        android:key="@string/settings_key_switch_keyboard_on_space"
-        android:persistent="true"
-        android:summaryOff="@string/switch_keyboard_on_space_off_summary"
-        android:summaryOn="@string/switch_keyboard_on_space_on_summary"
-        android:title="@string/switch_keyboard_on_space"/>
-
-    <CheckBoxPreference
-        android:defaultValue="true"
-        android:key="double_space_to_period"
-        android:persistent="true"
-        android:summaryOff=""
-        android:summaryOn="@string/double_space_to_period_summary"
-        android:title="@string/double_space_to_period"/>
+        <CheckBoxPreference
+            android:defaultValue="@bool/settings_default_switch_to_alphabet_on_space"
+            android:key="@string/settings_key_switch_keyboard_on_space"
+            android:persistent="true"
+            android:summaryOff="@string/switch_keyboard_on_space_off_summary"
+            android:summaryOn="@string/switch_keyboard_on_space_on_summary"
+            android:title="@string/switch_keyboard_on_space"/>
+
+        <CheckBoxPreference
+            android:defaultValue="true"
+            android:key="double_space_to_period"
+            android:persistent="true"
+            android:summaryOff=""
+            android:summaryOn="@string/double_space_to_period_summary"
+            android:title="@string/double_space_to_period"/>
+
+        <CheckBoxPreference
+            android:defaultValue="@bool/settings_default_persistent_layout_per_package_id"
+            android:key="@string/settings_key_persistent_layout_per_package_id"
+            android:persistent="true"
+            android:summaryOff="@string/persistent_layout_per_package_id_off_summary"
+            android:summaryOn="@string/persistent_layout_per_package_id_on_summary"
+            android:title="@string/persistent_layout_per_package_id_title"/>
+
+    </PreferenceCategory>
 
     <PreferenceCategory
         android:key="hardware_keys_group"