Merge remote-tracking branch 'origin/master'

app/src/main/java/org/dslul/openboard/inputmethod/latin/Suggest.java

@@ -20,6 +20,7 @@ import android.text.TextUtils;
 import android.util.Log;
 
 import org.dslul.openboard.inputmethod.keyboard.Keyboard;
+import org.dslul.openboard.inputmethod.keyboard.KeyboardId;
 import org.dslul.openboard.inputmethod.latin.SuggestedWords.SuggestedWordInfo;
 import org.dslul.openboard.inputmethod.latin.common.Constants;
 import org.dslul.openboard.inputmethod.latin.common.StringUtils;
@@ -217,6 +218,10 @@ public final class Suggest {
                 || wordComposer.isMostlyCaps()
                 // We never auto-correct when suggestions are resumed because it would be unexpected
                 || wordComposer.isResumed()
+                // We don't autocorrect in URL or email input, since websites and emails can be
+                // deliberate misspellings of actual words
+                || keyboard.mId.mMode == KeyboardId.MODE_URL
+                || keyboard.mId.mMode == KeyboardId.MODE_EMAIL
                 // If we don't have a main dictionary, we never want to auto-correct. The reason
                 // for this is, the user may have a contact whose name happens to match a valid
                 // word in their language, and it will unexpectedly auto-correct. For example, if

app/src/main/res/values-ru/strings.xml

@@ -192,6 +192,8 @@
     <string name="user_dict_fast_scroll_alphabet" msgid="5431919401558285473">" АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ"</string>
     <string name="number_row">"Ряд с цифрами"</string>
     <string name="number_row_summary">"Всегда показывать отдельный ряд с цифрами."</string>
+    <string name="show_hints">"Подсказывать символы"</string>
+    <string name="show_hints_summary">"Показывать символы на клавишах"</string>
     <string name="prefs_resize_keyboard">"Включить изменение размера клавиатуры"</string>
     <string name="prefs_keyboard_height_scale">"Масштабирование по высоте"</string>
     <string name="delete_swipe">"Удаление жестом"</string>

app/src/main/res/values/strings.xml

@@ -209,9 +209,9 @@
     <string name="number_row_summary">Always show number row</string>
 
     <!-- Title of the settings to show key hints -->
-    <string name="show_hints">Подсказывать символы</string>
+    <string name="show_hints">Show key hints</string>
     <!-- Description of the settings to show hints -->
-    <string name="show_hints_summary">Показывать символы на клавишах</string>
+    <string name="show_hints_summary">Show long-press hints</string>
 
     <!-- Title of the settings to enable keyboard resizing -->
     <string name="prefs_resize_keyboard">Enable keyboard resizing</string>

app/src/main/res/xml/rowkeys_german3.xml

@@ -27,4 +27,17 @@
     <!-- b,n,m -->
     <include
         latin:keyboardLayout="@xml/rowkeys_qwertz3_right3" />
+    <!-- ß -->
+    <switch>
+        <case
+            latin:keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetAutomaticShifted|symbolsShifted"
+            >
+            <Key
+                latin:keySpec="ẞ" />
+        </case>
+        <default>
+            <Key
+                latin:keySpec="ß" />
+        </default>
+    </switch>
 </merge>

app/src/main/res/xml/rows_german.xml

@@ -54,8 +54,6 @@
             latin:keyStyle="shiftKeyStyle"
             latin:keyWidth="15%p"
             latin:visualInsetsRight="1%p" />
-        <Spacer
-            latin:keyWidth="2.8%p" />
         <include
             latin:keyboardLayout="@xml/rowkeys_german3" />
         <Key