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

am 0433c157: Merge "TextViews keep focus after Done" into ics-mr1

Browse Source 
* commit '0433c157141b9122f6c61498e909770f1db27c7c':
  TextViews keep focus after Done
This commit is contained in:
Gilles Debunne
2011-12-01 10:24:23 -08:00
committed by Android Git Automerger
parent d732efa297 0433c15714
commit 4fec974c2f
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3785,7 +3785,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
return; return;
} }
} }
// This is the handling for some default action. // This is the handling for some default action.
// Note that for backwards compatibility we don't do this // Note that for backwards compatibility we don't do this
// default handling if explicit ime options have not been given, // default handling if explicit ime options have not been given,
@@ -3816,7 +3816,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
if (imm != null && imm.isActive(this)) { if (imm != null && imm.isActive(this)) {
imm.hideSoftInputFromWindow(getWindowToken(), 0); imm.hideSoftInputFromWindow(getWindowToken(), 0);
} }
clearFocus();
return; return;
} }
} }
@@ -3838,7 +3837,7 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
| KeyEvent.FLAG_EDITOR_ACTION))); | KeyEvent.FLAG_EDITOR_ACTION)));
} }
} }
/** /**
* Set the private content type of the text, which is the * Set the private content type of the text, which is the
* {@link EditorInfo#privateImeOptions EditorInfo.privateImeOptions} * {@link EditorInfo#privateImeOptions EditorInfo.privateImeOptions}