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

Commit 236b9872 authored by Gilles Debunne's avatar Gilles Debunne Committed by Android (Google) Code Review
Browse files

Merge "Auto-clearing setError popup" into honeycomb

parents 45911e19 12ab6459

core/java/android/widget/TextView.java

+4 −7
Original line number Original line Diff line number Diff line
@@ -4735,8 +4735,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            if (otherEvent != null) {

            if (otherEvent != null) {

                try {

                try {

                    beginBatchEdit();

                    beginBatchEdit();

                    boolean handled = mInput.onKeyOther(this, (Editable) mText,

                    final boolean handled = mInput.onKeyOther(this, (Editable) mText, otherEvent);

                            otherEvent);

                    hideErrorIfUnchanged();

                    hideErrorIfUnchanged();

                    doDown = false;

                    doDown = false;

                    if (handled) {

                    if (handled) {
@@ -4752,12 +4751,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 
            

            

            if (doDown) {

            if (doDown) {

                beginBatchEdit();

                beginBatchEdit();

                if (mInput.onKeyDown(this, (Editable) mText, keyCode, event)) {

                final boolean handled = mInput.onKeyDown(this, (Editable) mText, keyCode, event);

                endBatchEdit();

                endBatchEdit();

                hideErrorIfUnchanged();

                hideErrorIfUnchanged();

                    return 1;

                if (handled) return 1;

                }

                endBatchEdit();

            }

            }

        }

        }