summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYigit Boyar <yboyar@google.com>2014-08-25 08:23:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-25 08:23:05 +0000
commitb3a523249e01bff3463abb5ae717394d0f5bf0ad (patch)
tree9df97098ac1b435189976f975f431f90d24f3679
parent5d13662bb59a932bd211bbef0623017a4daa2814 (diff)
parentc57a47a02cedfd6f053ca5a695fbbe4b6b6c7daf (diff)
downloadframeworks_base-b3a523249e01bff3463abb5ae717394d0f5bf0ad.zip
frameworks_base-b3a523249e01bff3463abb5ae717394d0f5bf0ad.tar.gz
frameworks_base-b3a523249e01bff3463abb5ae717394d0f5bf0ad.tar.bz2
am 3037469b: am af314829: am aca6557c: Merge "Clear TextView error when text changes" into lmp-dev
* commit '3037469b782ae76898ec794557b17407d84046e8': Clear TextView error when text changes
-rw-r--r--core/java/android/widget/TextView.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/widget/TextView.java b/core/java/android/widget/TextView.java
index 096fe88..9b3a1e0 100644
--- a/core/java/android/widget/TextView.java
+++ b/core/java/android/widget/TextView.java
@@ -5719,8 +5719,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
if (mEditor != null && mEditor.mKeyListener != null) {
- resetErrorChangedFlag();
-
boolean doDown = true;
if (otherEvent != null) {
try {
@@ -7637,6 +7635,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
list.get(i).afterTextChanged(text);
}
}
+ hideErrorIfUnchanged();
}
void updateAfterEdit() {
@@ -7676,7 +7675,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
ims.mChangedDelta += after-before;
}
-
+ resetErrorChangedFlag();
sendOnTextChanged(buffer, start, before, after);
onTextChanged(buffer, start, before, after);
}