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

am cfc2915d: In setDefaultSelection ensure that webkit is notified of the new selection.

Browse Source 
Merge commit 'cfc2915d926cee14380b54d0960262e748eed4f5' into eclair-mr2-plus-aosp

* commit 'cfc2915d926cee14380b54d0960262e748eed4f5':
  In setDefaultSelection ensure that webkit is notified of the new selection.
This commit is contained in:
Leon Scroggins
2009-12-02 07:42:26 -08:00
committed by Android Git Automerger
parent e258512797 cfc2915d92
commit 1e8c96251c
1 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -644,7 +644,22 @@ import java.util.ArrayList;
/* package */ void setDefaultSelection() {
Spannable text = (Spannable) getText();
int selection = mSingle ? text.length() : 0;
Selection. setSelection(text, selection, selection);
if (Selection.getSelectionStart(text) == selection
&& Selection.getSelectionEnd(text) == selection) {
// The selection of the UI copy is set correctly, but the
// WebTextView still needs to inform the webkit thread to set the
// selection. Normally that is done in onSelectionChanged, but
// onSelectionChanged will not be called because the UI copy is not
// changing. (This can happen when the WebTextView takes focus.
// That onSelectionChanged was blocked because the selection set
// when focusing is not necessarily the desirable selection for
// WebTextView.)
if (mWebView != null) {
mWebView.setSelection(selection, selection);
}
} else {
Selection.setSelection(text, selection, selection);
}
}
/**