Merge "Revert "Do not invoke textclassifier when dimissing the selection"" into sc-dev (2fdb6bd7) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+8 −16

Original line number	Diff line number	Diff line
		@@ -1725,21 +1725,13 @@ public class Editor {
		}

		private void updateFloatingToolbarVisibility(MotionEvent event) {
		if (mTextActionMode == null) {
		return;
		}
		if (mTextActionMode != null) {
		switch (event.getActionMasked()) {
		case MotionEvent.ACTION_MOVE:
		hideFloatingToolbar(ActionMode.DEFAULT_HIDE_DURATION);
		break;
		case MotionEvent.ACTION_UP: // fall through
		case MotionEvent.ACTION_CANCEL:
		final SelectionModifierCursorController selectionController =
		getSelectionController();
		final InsertionPointCursorController insertionController = getInsertionController();
		if ((selectionController != null && selectionController.isCursorBeingModified())
		\|\| (insertionController != null
		&& insertionController.isCursorBeingModified())) {
		showFloatingToolbar();
		}
		}