Merge "Add a check for misspelled span change." into nyc-dev (794f70f1) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+11 −3

Original line number	Original line	Diff line number	Diff line
	@@ -3284,10 +3284,18 @@ public class Editor {
	com.android.internal.R.id.addToDictionaryButton);		com.android.internal.R.id.addToDictionaryButton);
	mAddToDictionaryButton.setOnClickListener(new View.OnClickListener() {		mAddToDictionaryButton.setOnClickListener(new View.OnClickListener() {
	public void onClick(View v) {		public void onClick(View v) {
			final SuggestionSpan misspelledSpan =
			findEquivalentSuggestionSpan(mMisspelledSpanInfo);
			if (misspelledSpan == null) {
			// Span has been removed.
			return;
			}
	final Editable editable = (Editable) mTextView.getText();		final Editable editable = (Editable) mTextView.getText();
	final int spanStart = editable.getSpanStart(		final int spanStart = editable.getSpanStart(misspelledSpan);
	mMisspelledSpanInfo.mSuggestionSpan);		final int spanEnd = editable.getSpanEnd(misspelledSpan);
	final int spanEnd = editable.getSpanEnd(mMisspelledSpanInfo.mSuggestionSpan);		if (spanStart < 0 \|\| spanEnd <= spanStart) {
			return;
			}
	final String originalText = TextUtils.substring(editable, spanStart, spanEnd);		final String originalText = TextUtils.substring(editable, spanStart, spanEnd);

	final Intent intent = new Intent(Settings.ACTION_USER_DICTIONARY_INSERT);		final Intent intent = new Intent(Settings.ACTION_USER_DICTIONARY_INSERT);