Merge "Ensure to reset state of selecting by word/char for new selections" into mnc-dev (95753e2f) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -4071,11 +4071,16 @@ public class Editor {
		offset = getNextCursorOffset(selectionEnd, false);
		mTouchWordDelta = 0.0f;
		}
		mInWord = !getWordIteratorWithText().isBoundary(offset);
		positionAtCursorOffset(offset, false);
		}
		}

		@Override
		protected void positionAtCursorOffset(int offset, boolean parentScrolled) {
		super.positionAtCursorOffset(offset, parentScrolled);
		mInWord = !getWordIteratorWithText().isBoundary(offset);
		}

		@Override
		public boolean onTouchEvent(MotionEvent event) {
		boolean superResult = super.onTouchEvent(event);
		@@ -4193,11 +4198,16 @@ public class Editor {
		offset = getNextCursorOffset(selectionStart, true);
		mTouchWordDelta = 0.0f;
		}
		mInWord = !getWordIteratorWithText().isBoundary(offset);
		positionAtCursorOffset(offset, false);
		}
		}

		@Override
		protected void positionAtCursorOffset(int offset, boolean parentScrolled) {
		super.positionAtCursorOffset(offset, parentScrolled);
		mInWord = !getWordIteratorWithText().isBoundary(offset);
		}

		@Override
		public boolean onTouchEvent(MotionEvent event) {
		boolean superResult = super.onTouchEvent(event);