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

am 60130138: Merge "Restart input when the webpage changes the text." into honeycomb

Browse Source 
* commit '6013013829d1f97970d3ed426006d2522303826f':
  Restart input when the webpage changes the text.
This commit is contained in:
Leon Scroggins
2011-01-21 14:33:03 -08:00
committed by Android Git Automerger
parent 0629ac78fc 6013013829
commit 12871245c7
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/webkit/WebTextView.java
View File

@@ -1087,7 +1087,7 @@ import junit.framework.Assert;
*/
/* package */ void setTextAndKeepSelection(String text) {
mPreChange = text.toString();
Editable edit = (Editable) getText();
Editable edit = getText();
int selStart = Selection.getSelectionStart(edit);
int selEnd = Selection.getSelectionEnd(edit);
mInSetTextAndKeepSelection = true;
@@ -1097,6 +1097,12 @@ import junit.framework.Assert;
if (selEnd > newLength) selEnd = newLength;
Selection.setSelection(edit, selStart, selEnd);
mInSetTextAndKeepSelection = false;
InputMethodManager imm = InputMethodManager.peekInstance();
if (imm != null && imm.isActive(this)) {
// Since the text has changed, do not allow the IME to replace the
// existing text as though it were a completion.
imm.restartInput(this);
}
updateCachedTextfield();
}