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

Merge "No NPE in Browser when pasting in WebTextView."

Browse Source
This commit is contained in:
Gilles Debunne
2010-12-07 14:48:38 -08:00
committed by Android (Google) Code Review
parent 923e5b7700 6da7e935f9
commit 2f0c6a460a
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7388,14 +7388,14 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
private boolean canSelectText() {
return textCanBeSelected() && mText.length() != 0;
return hasSelectionController() && mText.length() != 0;
}
private boolean textCanBeSelected() {
// prepareCursorController() relies on this method.
// If you change this condition, make sure prepareCursorController is called anywhere
// the value of this condition might be changed.
return (mText instanceof Spannable && mMovement != null && mMovement.canSelectArbitrarily());
return mText instanceof Spannable && mMovement != null && mMovement.canSelectArbitrarily();
}
private boolean canCut() {
@@ -7529,6 +7529,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
}
private void selectCurrentWord() {
if (!canSelectText()) {
return;
}
if (hasPasswordTransformationMethod()) {
// selectCurrentWord is not available on a password field and would return an
// arbitrary 10-charater selection around pressed position. Select all instead.
@@ -7544,7 +7548,6 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
minOffset = getSelectionStart();
maxOffset = getSelectionEnd();
} else {
// selectionModifierCursorController is guaranteed to exist at that point
SelectionModifierCursorController selectionController = getSelectionController();
minOffset = selectionController.getMinTouchOffset();
maxOffset = selectionController.getMaxTouchOffset();
@@ -7921,12 +7924,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
selectCurrentWord();
ActionMode.Callback actionModeCallback = new SelectionActionModeCallback();
if (actionModeCallback != null) {
mSelectionActionMode = startActionMode(actionModeCallback);
return mSelectionActionMode != null;
}
return false;
mSelectionActionMode = startActionMode(actionModeCallback);
return mSelectionActionMode != null;
}
/**