Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Fabrice Di Meglio
2012-11-13 11:03:19 -08:00
committed by Android (Google) Code Review
parent c1d5db7963 5acc379c54
commit 9d82d324de
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/widget/Editor.java
View File

@@ -291,6 +291,7 @@ public class Editor {
mErrorWasChanged = true; mErrorWasChanged = true;
if (mError == null) { if (mError == null) {
setErrorIcon(null);
if (mErrorPopup != null) { if (mErrorPopup != null) {
if (mErrorPopup.isShowing()) { if (mErrorPopup.isShowing()) {
mErrorPopup.dismiss(); mErrorPopup.dismiss();
@@ -299,10 +300,11 @@ public class Editor {
mErrorPopup = null; mErrorPopup = null;
} }
setErrorIcon(null); } else {
} else if (mTextView.isFocused()) {
showError();
setErrorIcon(icon); setErrorIcon(icon);
if (mTextView.isFocused()) {
showError();
}
} }
} }
@@ -321,8 +323,6 @@ public class Editor {
if (mErrorPopup.isShowing()) { if (mErrorPopup.isShowing()) {
mErrorPopup.dismiss(); mErrorPopup.dismiss();
} }
setErrorIcon(null);
} }
mShowErrorAfterAttach = false; mShowErrorAfterAttach = false;