Merge "All SuggestionSpans are removed when the window loses focus."
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 359cfcc..86b6b1d 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -7260,11 +7260,23 @@
mInputContentType.enterDown = false;
}
hideControllers();
+ removeAllSuggestionSpans();
}
startStopMarquee(hasWindowFocus);
}
+ private void removeAllSuggestionSpans() {
+ if (mText instanceof Editable) {
+ Editable editable = ((Editable) mText);
+ SuggestionSpan[] spans = editable.getSpans(0, mText.length(), SuggestionSpan.class);
+ final int length = spans.length;
+ for (int i = 0; i < length; i++) {
+ editable.removeSpan(spans[i]);
+ }
+ }
+ }
+
@Override
protected void onVisibilityChanged(View changedView, int visibility) {
super.onVisibilityChanged(changedView, visibility);