am 2ea838d5: Merge "Remove insertion action mode runnable on selection start" into mnc-dev

* commit '2ea838d539ec13215554e40303a757ea4a1f3d39':
  Remove insertion action mode runnable on selection start
This commit is contained in:
Clara Bayarri
2015-06-08 17:01:50 +00:00
committed by Android Git Automerger

View File

@@ -1752,11 +1752,10 @@ public class Editor {
* @return true if the drag was started.
*/
private boolean selectCurrentWordAndStartDrag() {
if (mInsertionActionModeRunnable != null) {
mTextView.removeCallbacks(mInsertionActionModeRunnable);
}
if (extractedTextModeWillBeStarted()) {
// Cancel the single tap delayed runnable.
if (mInsertionActionModeRunnable != null) {
mTextView.removeCallbacks(mInsertionActionModeRunnable);
}
return false;
}
if (mTextActionMode != null) {