Merge "Fix bug #7457897 Error icons are not shown in credit card entry form" into jb-mr1.1-dev (9d82d324) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -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;