Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev

2012-11-13 11:03:19 -08:00
parent c1d5db7963 5acc379c54
commit 9d82d324de
1 changed files with 5 additions and 5 deletions
--- a/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@ -291,6 +291,7 @@ public class Editor {
        mErrorWasChanged = true;

        if (mError == null) {
+            setErrorIcon(null);
            if (mErrorPopup != null) {
                if (mErrorPopup.isShowing()) {
                    mErrorPopup.dismiss();
@@ -299,10 +300,11 @@ public class Editor {
                mErrorPopup = null;
            }

-            setErrorIcon(null);
-        } else if (mTextView.isFocused()) {
-            showError();
+        } else {
            setErrorIcon(icon);
+            if (mTextView.isFocused()) {
+                showError();
+            }
        }
    }

@@ -321,8 +323,6 @@ public class Editor {
            if (mErrorPopup.isShowing()) {
                mErrorPopup.dismiss();
            }
-
-            setErrorIcon(null);
        }

        mShowErrorAfterAttach = false;