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

am b2212464: Merge "Ensure the selection does not change in setTextAndKeepSelection." into froyo

Browse Source 
Merge commit 'b2212464a3bc4103a9e5e88602d1097c835d7949' into froyo-plus-aosp

* commit 'b2212464a3bc4103a9e5e88602d1097c835d7949':
  Ensure the selection does not change in setTextAndKeepSelection.
This commit is contained in:
Leon Scroggins
2010-04-14 12:02:53 -07:00
committed by Android Git Automerger
parent a18df1341e b2212464a3
commit 876a5dfe3b
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -343,6 +343,7 @@ import java.util.ArrayList;
@Override @Override
protected void onSelectionChanged(int selStart, int selEnd) { protected void onSelectionChanged(int selStart, int selEnd) {
if (mInSetTextAndKeepSelection) return;
// This code is copied from TextView.onDraw(). That code does not get // This code is copied from TextView.onDraw(). That code does not get
// executed, however, because the WebTextView does not draw, allowing // executed, however, because the WebTextView does not draw, allowing
// webkit's drawing to show through. // webkit's drawing to show through.
@@ -799,8 +800,14 @@ import java.util.ArrayList;
/* package */ void setTextAndKeepSelection(String text) { /* package */ void setTextAndKeepSelection(String text) {
mPreChange = text.toString(); mPreChange = text.toString();
Editable edit = (Editable) getText(); Editable edit = (Editable) getText();
int selStart = Selection.getSelectionStart(edit);
int selEnd = Selection.getSelectionEnd(edit);
mInSetTextAndKeepSelection = true; mInSetTextAndKeepSelection = true;
edit.replace(0, edit.length(), text); edit.replace(0, edit.length(), text);
int newLength = edit.length();
if (selStart > newLength) selStart = newLength;
if (selEnd > newLength) selEnd = newLength;
Selection.setSelection(edit, selStart, selEnd);
mInSetTextAndKeepSelection = false; mInSetTextAndKeepSelection = false;
updateCachedTextfield(); updateCachedTextfield();
} }