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

Commit a8a57fab authored by Yuichiro Hanada's avatar Yuichiro Hanada Committed by Android (Google) Code Review
Browse files

Merge "Fix TextView.shouldAdvanceFocusOnTab()."

parents f907bcf0 ed54866b

core/java/android/widget/TextView.java

+3 −3
Original line number Diff line number Diff line
@@ -8282,9 +8282,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
        if (getKeyListener() != null && !mSingleLine && mEditor != null

                && (mEditor.mInputType & EditorInfo.TYPE_MASK_CLASS)

                        == EditorInfo.TYPE_CLASS_TEXT) {

            int variation = mEditor.mInputType & EditorInfo.TYPE_MASK_VARIATION;

            if (variation == EditorInfo.TYPE_TEXT_FLAG_IME_MULTI_LINE

                    || variation == EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE) {

            int multilineFlags = EditorInfo.TYPE_TEXT_FLAG_IME_MULTI_LINE

                    | EditorInfo.TYPE_TEXT_FLAG_MULTI_LINE;

            if ((mEditor.mInputType & multilineFlags) != 0) {

                return false;

            }

        }