Merge "Do not run the spell checker in SearchView" into jb-dev

1 files changed, 7 insertions, 0 deletions

diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java
index 8f3a311242dc..a0e961fa4200 100644
--- a/core/java/android/widget/SearchView.java
+++ b/core/java/android/widget/SearchView.java
@@ -1091,6 +1091,13 @@ public class SearchView extends LinearLayout implements CollapsibleActionView {
             inputType &= ~InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE;
             if (mSearchable.getSuggestAuthority() != null) {
                 inputType |= InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE;
+                // TYPE_TEXT_FLAG_AUTO_COMPLETE means that the text editor is performing
+                // auto-completion based on its own semantics, which it will present to the user
+                // as they type. This generally means that the input method should not show its
+                // own candidates, and the spell checker should not be in action. The text editor
+                // supplies its candidates by calling InputMethodManager.displayCompletions(),
+                // which in turn will call InputMethodSession.displayCompletions().
+                inputType |= InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;
             }
         }
         mQueryTextView.setInputType(inputType);