Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee7ce3cc authored by Keisuke Kuroyanagi's avatar Keisuke Kuroyanagi Committed by android-build-merger
Browse files

Merge "Add a check for misspelled span change." into nyc-dev am: 794f70f1 

am: f2fbb293

* commit 'f2fbb293':
  Add a check for misspelled span change.
parents e1b87d2c f2fbb293

core/java/android/widget/Editor.java

+11 −3
Original line number Diff line number Diff line
@@ -3284,10 +3284,18 @@ public class Editor { 
                    com.android.internal.R.id.addToDictionaryButton);

            mAddToDictionaryButton.setOnClickListener(new View.OnClickListener() {

                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 int spanStart = editable.getSpanStart(

                            mMisspelledSpanInfo.mSuggestionSpan);

                    final int spanEnd = editable.getSpanEnd(mMisspelledSpanInfo.mSuggestionSpan);

                    final int spanStart = editable.getSpanStart(misspelledSpan);

                    final int spanEnd = editable.getSpanEnd(misspelledSpan);

                    if (spanStart < 0 || spanEnd <= spanStart) {

                        return;

                    }

                    final String originalText = TextUtils.substring(editable, spanStart, spanEnd);



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