Merge "Fixes around extract mode" (bdf7f965) · Commits · e / os / android_frameworks_base

core/java/android/inputmethodservice/ExtractEditText.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -100,6 +100,9 @@ public class ExtractEditText extends EditText {

		@Override public boolean onTextContextMenuItem(int id) {
		if (mIME != null && mIME.onExtractTextContextMenuItem(id)) {
		// Mode was started on Extracted, needs to be stopped here.
		// Cut and paste will change the text, which stops selection mode.
		if (id == android.R.id.copy) stopSelectionActionMode();
		return true;
		}
		return super.onTextContextMenuItem(id);

+6 −5

Original line number	Diff line number	Diff line
		@@ -5273,14 +5273,12 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		state.handleUpEvent(event);
		}
		if (event.isTracking() && !event.isCanceled()) {
		if (isInSelectionMode) {
		stopSelectionActionMode();
		return true;
		}
		}
		}
		}
		}
		return super.onKeyPreIme(keyCode, event);
		}

		@@ -10184,7 +10182,10 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		return false;
		}

		private void stopSelectionActionMode() {
		/**
		* @hide
		*/
		protected void stopSelectionActionMode() {
		if (mSelectionActionMode != null) {
		// This will hide the mSelectionModifierCursorController
		mSelectionActionMode.finish();