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

Commit 88f04309 authored by Yohei Yukawa's avatar Yohei Yukawa Committed by Android (Google) Code Review
Browse files

Merge "Ensure EditorInfo#locales is set before return."

parents e09e245b 0445fdf3

core/java/android/widget/TextView.java

+3 −3
Original line number Diff line number Diff line
@@ -6440,6 +6440,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                outAttrs.imeOptions |= EditorInfo.IME_FLAG_NO_ENTER_ACTION;

            }

            outAttrs.hintText = mHint;

            // LocaleList is designed to be immutable.  This is theoretically equivalent to copy

            // the snapshot of the current text locales.

            outAttrs.locales = getTextLocales();

            if (mText instanceof Editable) {

                InputConnection ic = new EditableInputConnection(this);

                outAttrs.initialSelStart = getSelectionStart();
@@ -6447,9 +6450,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
                outAttrs.initialCapsMode = ic.getCursorCapsMode(getInputType());

                return ic;

            }

            // LocaleList is designed to be immutable.  This is theoretically equivalent to copy

            // the snapshot of the current text locales.

            outAttrs.locales = getTextLocales();

        }

        return null;

    }