Merge "Consider punctuation treatment when selecting text." into mnc-dev

diff --cc core/java/android/widget/Editor.java
index 0a671eb,4a7d616..86a100f
--- 1/core/java/android/widget/Editor.java
--- 2/core/java/android/widget/Editor.java
+++ b/core/java/android/widget/Editor.java
@@@ -3899,9 -3960,13 +3956,9 @@@ public class Editor 
          public void updatePosition(float x, float y) {
              final int trueOffset = mTextView.getOffsetForPosition(x, y);
              final int currLine = mTextView.getLineAtCoordinate(y);
 -
 -            // Don't select white space on different lines.
 -            if (isWhitespaceLine(mPrevLine, currLine, trueOffset)) return;
 -
              boolean positionCursor = false;
              int offset = trueOffset;
-             int end = getWordEnd(offset, true);
+             int end = getWordEnd(offset);
              int start = getWordStart(offset);
  
              if (offset < mPreviousOffset) {
@@@ -3997,10 -4062,13 +4054,9 @@@
          public void updatePosition(float x, float y) {
              final int trueOffset = mTextView.getOffsetForPosition(x, y);
              final int currLine = mTextView.getLineAtCoordinate(y);
 -
 -            // Don't select white space on different lines.
 -            if (isWhitespaceLine(mPrevLine, currLine, trueOffset)) return;
 -
              int offset = trueOffset;
              boolean positionCursor = false;
- 
-             int end = getWordEnd(offset, true);
+             int end = getWordEnd(offset);
              int start = getWordStart(offset);
  
              if (offset > mPreviousOffset) {