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

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

Merge "Reset mWordIteratorWithText when SpellChecker locale is changed." into... 

Merge "Reset mWordIteratorWithText when SpellChecker locale is changed." into nyc-dev am: 01ef02d7
am: 5b47ae74

* commit '5b47ae74':
  Reset mWordIteratorWithText when SpellChecker locale is changed.
parents a2fbe47d 5b47ae74

core/java/android/widget/Editor.java

+2 −1
Original line number Diff line number Diff line
@@ -926,7 +926,8 @@ public class Editor { 
    }



    void onLocaleChanged() {

        // Will be re-created on demand in getWordIterator with the proper new locale

        // Will be re-created on demand in getWordIterator and getWordIteratorWithText with the

        // proper new locale

        mWordIterator = null;

        mWordIteratorWithText = null;

    }

core/java/android/widget/TextView.java

+1 −2
Original line number Diff line number Diff line
@@ -8923,8 +8923,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
    }



    void onLocaleChanged() {

        // Will be re-created on demand in getWordIterator with the proper new locale

        mEditor.mWordIterator = null;

        mEditor.onLocaleChanged();

    }



    /**