commit 80a3083fdd106b2f839d50e1c861347faa969781
author Gilles Debunne <debunne@google.com> Sun Jan 30 15:53:03 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sun Jan 30 15:53:03 2011 -0800
tree dd594c6964302031093b76a2972c18a59556ae18
parent 471ebbca5f404062bed232aa27da9c1f1ebf0a1d
parent 236b9872140599d1856d48e53b8e109e506fd88f

am 236b9872: Merge "Auto-clearing setError popup" into honeycomb

* commit '236b9872140599d1856d48e53b8e109e506fd88f':
  Auto-clearing setError popup

core/java/android/widget/TextView.java

diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 10ec6ca..c4c4ae3 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -4735,8 +4735,7 @@
             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 @@
             
             if (doDown) {
                 beginBatchEdit();
-                if (mInput.onKeyDown(this, (Editable) mText, keyCode, event)) {
-                    endBatchEdit();
-                    hideErrorIfUnchanged();
-                    return 1;
-                }
+                final boolean handled = mInput.onKeyDown(this, (Editable) mText, keyCode, event);
                 endBatchEdit();
+                hideErrorIfUnchanged();
+                if (handled) return 1;
             }
         }