commit 742bd40328a18849da71a3331d2f328341927a29
author Keisuke Kuroyanagi <ksk@google.com> Tue Oct 27 05:46:47 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 27 05:46:47 2015 +0000
tree 17a8b0cb3eea793f8b86402c2bb4732b9c591156
parent 09424c83d6b2351d8937e4d33b22ade36bb39e51
parent 45a60d1a431065c66c92f0b11c1eaf03613a4dd6

Merge "Fix: Last char can be excluded from mouse selection."

core/java/android/text/method/ArrowKeyMovementMethod.java

diff --git a/core/java/android/text/method/ArrowKeyMovementMethod.java b/core/java/android/text/method/ArrowKeyMovementMethod.java
index de509b2..8470798 100644
--- a/core/java/android/text/method/ArrowKeyMovementMethod.java
+++ b/core/java/android/text/method/ArrowKeyMovementMethod.java
@@ -238,6 +238,7 @@
             initialScrollY = Touch.getInitialScrollY(widget, buffer);
         }
 
+        boolean wasTouchSelecting = isTouchSelecting(isMouse, buffer);
         boolean handled = Touch.onTouchEvent(widget, buffer, event);
 
         if (widget.didTouchFocusSelect() && !isMouse) {
@@ -301,7 +302,7 @@
                 }
 
                 int offset = widget.getOffsetForPosition(event.getX(), event.getY());
-                if (isTouchSelecting(isMouse, buffer)) {
+                if (wasTouchSelecting) {
                     buffer.removeSpan(LAST_TAP_DOWN);
                     Selection.extendSelection(buffer, offset);
                 }