commit 1586dc6edffc75f3ca5cf9a4b632c0972820dcf8
author Jean Chalard <jchalard@google.com> Tue Sep 13 23:44:44 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 13 23:44:44 2011 -0700
tree 91befc461037d4b5a9ea3a0535ffc845acd75891
parent 14c840fb27376e2ea2cc66804a1a545551e3a747
parent d97def5925782769716e562d5d5fe72f61feef59

Merge "Fix a bug where the user dict's locale match would be wrong"

java/res/xml/kbd_rows_symbols.xml

diff --git a/java/res/xml/kbd_rows_symbols.xml b/java/res/xml/kbd_rows_symbols.xml
index e0ede8b..2235f4d 100644
--- a/java/res/xml/kbd_rows_symbols.xml
+++ b/java/res/xml/kbd_rows_symbols.xml
@@ -101,8 +101,8 @@
         <Key
             latin:keyLabel="!"
             latin:moreKeys="¡" />
-        <!-- Note: DroidSans doesn't have double-high-reversed-quotation '\u201f' glyph. -->
-        <!-- latin:moreKeys="“,”,„,‟,«,»" -->
+        <!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
+            <!-- latin:moreKeys="“,”,„,‟,«,»" -->
         <Key
             latin:keyLabel="&quot;"
             latin:moreKeys="“,”,«,»"

java/res/xml/kbd_symbols_shift_row4.xml

diff --git a/java/res/xml/kbd_symbols_shift_row4.xml b/java/res/xml/kbd_symbols_shift_row4.xml
index c8d5293..99fa80a 100644
--- a/java/res/xml/kbd_symbols_shift_row4.xml
+++ b/java/res/xml/kbd_symbols_shift_row4.xml
@@ -32,9 +32,11 @@
                 <Key
                     latin:keyStyle="toAlphaKeyStyle"
                     latin:keyWidth="15%p" />
+                <!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
+                    <!-- latin:keyLabelOption="hasPopupHint" -->
+                    <!-- latin:moreKeys="‟" -->
                 <Key
                     latin:keyLabel="„"
-                    latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛"
                     latin:keyStyle="functionalKeyStyle" />
                 <Key
                     latin:keyStyle="spaceKeyStyle"
@@ -53,9 +55,11 @@
                     latin:keyWidth="13.75%p" />
                 <include
                     latin:keyboardLayout="@xml/kbd_settings_or_tab" />
+                <!-- Note: Neither DroidSans nor Roboto have a glyph for ‟ Double high-reversed-9 quotation mark U+201F. -->
+                    <!-- latin:keyLabelOption="hasPopupHint" -->
+                    <!-- latin:moreKeys="‟" -->
                 <Key
                     latin:keyLabel="„"
-                    latin:moreKeys="“,”,„,‟,«,»,‘,’,‚,‛"
                     latin:keyWidth="9.2%p"
                     latin:keyStyle="functionalKeyStyle" />
                 <Key

java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java

diff --git a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
index 3cf8788..5883759 100644
--- a/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
+++ b/java/src/com/android/inputmethod/latin/spellcheck/AndroidSpellCheckerService.java
@@ -293,7 +293,7 @@
                 final int suggestionsLimit) {
             final String text = textInfo.getText();
 
-            if (TextUtils.isEmpty(text)) return EMPTY_SUGGESTIONS_INFO;
+            if (TextUtils.isEmpty(text) || text.length() <= 1) return EMPTY_SUGGESTIONS_INFO;
 
             final SuggestionsGatherer suggestionsGatherer =
                     new SuggestionsGatherer(suggestionsLimit);