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

Merge "Ignore smart selection for multi-word selections."

Browse Source
This commit is contained in:
Abodunrinwa Toki
2017-02-01 10:51:02 +00:00
committed by Android (Google) Code Review
parent 5668955ecd f9a81f352e
commit 8e332cc54b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/java/android/widget/Editor.java
View File

@@ -1984,12 +1984,12 @@ public class Editor {
if (mRestartActionModeOnNextRefresh) {
// To avoid distraction, newly start action mode only when selection action
// mode is being restarted.
startSelectionActionMode(getTextClassifierInfo(true));
startSelectionActionMode(null);
}
} else if (selectionController == null || !selectionController.isActive()) {
// Insertion action mode is active. Avoid dismissing the selection.
stopTextActionModeWithPreservingSelection();
startSelectionActionMode(getTextClassifierInfo(true));
startSelectionActionMode(null);
} else {
mTextActionMode.invalidateContentRect();
}
@@ -5496,8 +5496,9 @@ public class Editor {
resetDragAcceleratorState();
if (mTextView.hasSelection()) {
// TODO: Do not invoke the text assistant if this was a drag selection.
startSelectionActionMode(getTextClassifierInfo(true));
// Do not invoke the text assistant if this was a drag selection.
startSelectionActionMode(
mHaventMovedEnoughToStartDrag ? getTextClassifierInfo(true) : null);
}
break;
}