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

am 236b9872: Merge "Auto-clearing setError popup" into honeycomb

Browse Source 
* commit '236b9872140599d1856d48e53b8e109e506fd88f':
  Auto-clearing setError popup
This commit is contained in:
Gilles Debunne
2011-01-30 15:53:03 -08:00
committed by Android Git Automerger
parent 471ebbca5f 236b987214
commit 80a3083fdd
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/widget/TextView.java
View File

@@ -4735,8 +4735,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (otherEvent != null) { if (otherEvent != null) {
try { try {
beginBatchEdit(); beginBatchEdit();
boolean handled = mInput.onKeyOther(this, (Editable) mText, final boolean handled = mInput.onKeyOther(this, (Editable) mText, otherEvent);
otherEvent);
hideErrorIfUnchanged(); hideErrorIfUnchanged();
doDown = false; doDown = false;
if (handled) { if (handled) {
@@ -4752,12 +4751,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (doDown) { if (doDown) {
beginBatchEdit(); beginBatchEdit();
if (mInput.onKeyDown(this, (Editable) mText, keyCode, event)) { final boolean handled = mInput.onKeyDown(this, (Editable) mText, keyCode, event);
endBatchEdit();
hideErrorIfUnchanged();
return 1;
}
endBatchEdit(); endBatchEdit();
hideErrorIfUnchanged();
if (handled) return 1;
} }
} }