Merge "Auto-clearing setError popup" into honeycomb (236b9872) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+4 −7

Original line number	Diff line number	Diff line
		@@ -4735,8 +4735,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		if (otherEvent != null) {
		try {
		beginBatchEdit();
		boolean handled = mInput.onKeyOther(this, (Editable) mText,
		otherEvent);
		final boolean handled = mInput.onKeyOther(this, (Editable) mText, otherEvent);
		hideErrorIfUnchanged();
		doDown = false;
		if (handled) {
		@@ -4752,12 +4751,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		if (doDown) {
		beginBatchEdit();
		if (mInput.onKeyDown(this, (Editable) mText, keyCode, event)) {
		final boolean handled = mInput.onKeyDown(this, (Editable) mText, keyCode, event);
		endBatchEdit();
		hideErrorIfUnchanged();
		return 1;
		}
		endBatchEdit();
		if (handled) return 1;
		}
		}