From cfa27dbb7f716ee1fedbce92439efec22a3a2320 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Mon, 26 Jun 2023 14:58:15 +0200
Subject: [PATCH] fix issues with suggestions

---
 README.md                                     |  4 +++-
 .../inputmethod/latin/InputAttributes.java    |  2 +-
 ...nslate-config-spacing-and-punctuations.xml | 22 +++++++++++++++++++
 ...nslate-config-spacing-and-punctuations.xml |  2 +-
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/values-es/donottranslate-config-spacing-and-punctuations.xml

diff --git a/README.md b/README.md
index 5f56ce638..2265c718e 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ Plan / to do:
 * ~user-selectable dictionaries, https://github.com/openboard-team/openboard/pull/578~
   * ~make additional dictionaries available for download (from OpenBoard PRs)~
 * multi-lingual typing, https://github.com/openboard-team/openboard/pull/593
-* suggestion fixes, https://github.com/openboard-team/openboard/pull/694, https://github.com/openboard-team/openboard/issues/795, https://github.com/openboard-team/openboard/issues/660
+* ~suggestion fixes, https://github.com/openboard-team/openboard/pull/694, https://github.com/openboard-team/openboard/issues/795, https://github.com/openboard-team/openboard/issues/660~
 * improve auto-space insertion, https://github.com/openboard-team/openboard/pull/576
 * emoji prediction/search, either https://github.com/openboard-team/openboard/pull/749 or use dictionaries
 * theming, https://github.com/openboard-team/openboard/issues/124
@@ -30,6 +30,8 @@ Changes:
   * add Arabic dictionary for download, from https://github.com/remi0s/aosp-dictionary-tools/blob/master/dictsCreated/WikiAndOpenSubtitles/ar_wordlist.combined / https://github.com/openboard-team/openboard/pull/450
   * add Hebrew dictionary for download, from https://github.com/Hananel-Hazan/aosp-dictionary-tools/blob/master/hebrew-hspell.txt.combined.new / https://github.com/openboard-team/openboard/pull/300
   * add Galician dictionary for download, from https://github.com/chavaone/openboard/blob/master/dictionaries/es_GL_wordlist.combined.gz / https://github.com/openboard-team/openboard/pull/291
+* fix suggestions after some characters, https://github.com/openboard-team/openboard/pull/694, https://github.com/openboard-team/openboard/issues/795
+* fix suggestions sometimes not being shown, https://github.com/openboard-team/openboard/pull/709
 
 -----
 
diff --git a/app/src/main/java/org/dslul/openboard/inputmethod/latin/InputAttributes.java b/app/src/main/java/org/dslul/openboard/inputmethod/latin/InputAttributes.java
index 4fdf28315..aba07abc5 100644
--- a/app/src/main/java/org/dslul/openboard/inputmethod/latin/InputAttributes.java
+++ b/app/src/main/java/org/dslul/openboard/inputmethod/latin/InputAttributes.java
@@ -105,7 +105,7 @@ public final class InputAttributes {
 
         // TODO: Have a helper method in InputTypeUtils
         // Make sure that passwords are not displayed in {@link SuggestionStripView}.
-        mShouldShowSuggestions = !(mIsPasswordField || flagNoSuggestions);
+        mShouldShowSuggestions = !mIsPasswordField;
 
         mShouldInsertSpacesAutomatically = InputTypeUtils.isAutoSpaceFriendlyType(inputType);
 
diff --git a/app/src/main/res/values-es/donottranslate-config-spacing-and-punctuations.xml b/app/src/main/res/values-es/donottranslate-config-spacing-and-punctuations.xml
new file mode 100644
index 000000000..9858fb52e
--- /dev/null
+++ b/app/src/main/res/values-es/donottranslate-config-spacing-and-punctuations.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2009, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?¡¿/_\"</string>
+</resources>
diff --git a/app/src/main/res/values/donottranslate-config-spacing-and-punctuations.xml b/app/src/main/res/values/donottranslate-config-spacing-and-punctuations.xml
index 06144d021..9acd35cbd 100644
--- a/app/src/main/res/values/donottranslate-config-spacing-and-punctuations.xml
+++ b/app/src/main/res/values/donottranslate-config-spacing-and-punctuations.xml
@@ -30,7 +30,7 @@
     <string name="symbols_clustering_together"></string>
     <!-- Symbols that separate words -->
     <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) -->
-    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"</string>
+    <string name="symbols_word_separators">"&#x0009;&#x0020;&#x000A;&#x00A0;"()[]{}*&amp;&lt;&gt;+=|.,;:!?/_\"„“</string>
     <!-- Word connectors -->
     <string name="symbols_word_connectors">\'-</string>
     <!-- The sentence separator code point, for capitalization and auto-insertion -->