summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYigit Boyar <yboyar@google.com>2014-08-23 00:50:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-08-23 00:50:22 +0000
commitc57a47a02cedfd6f053ca5a695fbbe4b6b6c7daf (patch)
tree409bf93818f2a362321f01913efee56b0cede811
parent5cd8ae9146e8f36bafa47cf4cc5ea73a0ae5e5dd (diff)
parent2d45c004580cb774c39a0d2d51815bfb3f693485 (diff)
downloadframeworks_base-c57a47a02cedfd6f053ca5a695fbbe4b6b6c7daf.zip
frameworks_base-c57a47a02cedfd6f053ca5a695fbbe4b6b6c7daf.tar.gz
frameworks_base-c57a47a02cedfd6f053ca5a695fbbe4b6b6c7daf.tar.bz2
am af314829: am aca6557c: Merge "Clear TextView error when text changes" into lmp-dev
* commit 'af314829d18caaeb84b0a6bdd7e8745f799c9df6': 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);
}