Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fixed SpellCheckerSessions leak in TextView" into ics-mr1

Browse Source
This commit is contained in:
Gilles Debunne
2011-12-08 18:18:25 -08:00
committed by Android (Google) Code Review
parent 316ca5059e c115fa041c
commit df37228951
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/java/android/widget/TextView.java
View File

@@ -3207,7 +3207,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} }
boolean needEditableForNotification = false; boolean needEditableForNotification = false;
boolean startSpellCheck = false;
if (mListeners != null && mListeners.size() != 0) { if (mListeners != null && mListeners.size() != 0) {
needEditableForNotification = true; needEditableForNotification = true;
@@ -3219,7 +3218,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
setFilters(t, mFilters); setFilters(t, mFilters);
InputMethodManager imm = InputMethodManager.peekInstance(); InputMethodManager imm = InputMethodManager.peekInstance();
if (imm != null) imm.restartInput(this); if (imm != null) imm.restartInput(this);
startSpellCheck = true;
} else if (type == BufferType.SPANNABLE || mMovement != null) { } else if (type == BufferType.SPANNABLE || mMovement != null) {
text = mSpannableFactory.newSpannable(text); text = mSpannableFactory.newSpannable(text);
} else if (!(text instanceof CharWrapper)) { } else if (!(text instanceof CharWrapper)) {
@@ -3308,11 +3306,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
sendOnTextChanged(text, 0, oldlen, textLength); sendOnTextChanged(text, 0, oldlen, textLength);
onTextChanged(text, 0, oldlen, textLength); onTextChanged(text, 0, oldlen, textLength);
if (startSpellCheck && mSpellChecker != null) {
// This view has to have been previously attached for mSpellChecker to exist
updateSpellCheckSpans(0, textLength);
}
if (needEditableForNotification) { if (needEditableForNotification) {
sendAfterTextChanged((Editable) text); sendAfterTextChanged((Editable) text);
} }
@@ -4479,8 +4472,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// Resolve drawables as the layout direction has been resolved // Resolve drawables as the layout direction has been resolved
resolveDrawables(); resolveDrawables();
updateSpellCheckSpans(0, mText.length()); updateSpellCheckSpans(0, mText.length(), true /* create the spell checker if needed */);
} }
@Override @Override
@@ -7631,7 +7624,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} }
} }
updateSpellCheckSpans(start, start + after); updateSpellCheckSpans(start, start + after, false);
// Hide the controllers as soon as text is modified (typing, procedural...) // Hide the controllers as soon as text is modified (typing, procedural...)
// We do not hide the span controllers, since they can be added when a new text is // We do not hide the span controllers, since they can be added when a new text is
@@ -7789,17 +7782,22 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
} }
} }
if (newStart < 0 && what instanceof SpellCheckSpan) { if (mSpellChecker != null && newStart < 0 && what instanceof SpellCheckSpan) {
getSpellChecker().removeSpellCheckSpan((SpellCheckSpan) what); mSpellChecker.removeSpellCheckSpan((SpellCheckSpan) what);
} }
} }
/** /**
* Create new SpellCheckSpans on the modified region. * Create new SpellCheckSpans on the modified region.
*/ */
private void updateSpellCheckSpans(int start, int end) { private void updateSpellCheckSpans(int start, int end, boolean createSpellChecker) {
if (isTextEditable() && isSuggestionsEnabled()) { if (isTextEditable() && isSuggestionsEnabled()) {
getSpellChecker().spellCheck(start, end); if (mSpellChecker == null && createSpellChecker) {
mSpellChecker = new SpellChecker(this);
}
if (mSpellChecker != null) {
mSpellChecker.spellCheck(start, end);
}
} }
} }
@@ -8970,13 +8968,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return packRangeInLong(offset, offset); return packRangeInLong(offset, offset);
} }
private SpellChecker getSpellChecker() {
if (mSpellChecker == null) {
mSpellChecker = new SpellChecker(this);
}
return mSpellChecker;
}
private long getLastTouchOffsets() { private long getLastTouchOffsets() {
SelectionModifierCursorController selectionController = getSelectionController(); SelectionModifierCursorController selectionController = getSelectionController();
final int minOffset = selectionController.getMinTouchOffset(); final int minOffset = selectionController.getMinTouchOffset();
@@ -9931,7 +9922,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
// There is no way to know if the word was indeed added. Re-check. // There is no way to know if the word was indeed added. Re-check.
// TODO The ExtractEditText should remove the span in the original text instead // TODO The ExtractEditText should remove the span in the original text instead
editable.removeSpan(suggestionInfo.suggestionSpan); editable.removeSpan(suggestionInfo.suggestionSpan);
updateSpellCheckSpans(spanStart, spanEnd); updateSpellCheckSpans(spanStart, spanEnd, false);
} else { } else {
// SuggestionSpans are removed by replace: save them before // SuggestionSpans are removed by replace: save them before
SuggestionSpan[] suggestionSpans = editable.getSpans(spanStart, spanEnd, SuggestionSpan[] suggestionSpans = editable.getSpans(spanStart, spanEnd,