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

Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev

Browse Source
This commit is contained in:
Romain Guy
2012-11-06 16:15:26 -08:00
committed by Android (Google) Code Review
parent 4a1b6e4242 d1cc1878cc
commit 1b3b2544e6
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,13 +289,7 @@ public class Editor {
public void setError(CharSequence error, Drawable icon) {
mError = TextUtils.stringOrSpannedString(error);
mErrorWasChanged = true;
final Drawables dr = mTextView.mDrawables;
if (dr != null) {
mTextView.setCompoundDrawables(dr.mDrawableLeft, dr.mDrawableTop, icon,
dr.mDrawableBottom);
} else {
mTextView.setCompoundDrawables(null, null, icon, null);
}
if (mError == null) {
if (mErrorPopup != null) {
if (mErrorPopup.isShowing()) {
@@ -304,10 +298,21 @@ public class Editor {
mErrorPopup = null;
}
setErrorIcon(null);
} else if (mTextView.isFocused()) {
showError();
setErrorIcon(icon);
}
}
private void setErrorIcon(Drawable icon) {
final Drawables dr = mTextView.mDrawables;
if (dr != null) {
mTextView.setCompoundDrawables(dr.mDrawableLeft, dr.mDrawableTop, icon,
dr.mDrawableBottom);
} else {
if (mTextView.isFocused()) {
showError();
}
mTextView.setCompoundDrawables(null, null, icon, null);
}
}
@@ -316,6 +321,8 @@ public class Editor {
if (mErrorPopup.isShowing()) {
mErrorPopup.dismiss();
}
setErrorIcon(null);
}
mShowErrorAfterAttach = false;