From 12ab64593f557674f783e39ab804a7cd033b0050 Mon Sep 17 00:00:00 2001
From: Gilles Debunne <debunne@google.com>
Date: Sun, 30 Jan 2011 12:08:25 -0800
Subject: [PATCH] Auto-clearing setError popup

Bug 3403325

Error popup has to be dismissed whether or not the key was handled.

Change-Id: Ib6326b27fc521398f3cb0c546d29a7de9df18375
---
 core/java/android/widget/TextView.java | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

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