Merge "Editor: Allow invalidation of the Text Selection Action Mode" (4c42bc04) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+45 −24

Original line number	Diff line number	Diff line
		@@ -1668,6 +1668,7 @@ public class Editor {
		if (mSelectionActionMode != null) {
		// Selection action mode is already started
		// TODO: revisit invocations to minimize this case.
		mSelectionActionMode.invalidate();
		return false;
		}
		ActionMode.Callback actionModeCallback = new SelectionActionModeCallback();
		@@ -1682,6 +1683,7 @@ public class Editor {
		boolean startSelectionActionModeWithSelection() {
		if (mSelectionActionMode != null) {
		// Selection action mode is already started
		mSelectionActionMode.invalidate();
		return false;
		}

		@@ -2965,6 +2967,28 @@ public class Editor {

		@Override
		public boolean onCreateActionMode(ActionMode mode, Menu menu) {
		mode.setTitle(mTextView.getContext().getString(
		com.android.internal.R.string.textSelectionCABTitle));
		mode.setSubtitle(null);
		mode.setTitleOptionalHint(true);
		populateMenuWithItems(menu);

		if (mCustomSelectionActionModeCallback != null) {
		if (!mCustomSelectionActionModeCallback.onCreateActionMode(mode, menu)) {
		// The custom mode can choose to cancel the action mode
		return false;
		}
		}

		if (menu.hasVisibleItems() \|\| mode.getCustomView() != null) {
		mTextView.setHasTransientState(true);
		return true;
		} else {
		return false;
		}
		}

		private void populateMenuWithItems(Menu menu) {
		final boolean legacy = mTextView.getContext().getApplicationInfo().targetSdkVersion <
		Build.VERSION_CODES.LOLLIPOP;
		final Context context = !legacy && menu instanceof MenuBuilder ?
		@@ -2973,11 +2997,6 @@ public class Editor {
		final TypedArray styledAttributes = context.obtainStyledAttributes(
		com.android.internal.R.styleable.SelectionModeDrawables);

		mode.setTitle(mTextView.getContext().getString(
		com.android.internal.R.string.textSelectionCABTitle));
		mode.setSubtitle(null);
		mode.setTitleOptionalHint(true);

		if (mTextView.canCut()) {
		menu.add(0, TextView.ID_CUT, 0, com.android.internal.R.string.cut).
		setIcon(styledAttributes.getResourceId(
		@@ -3012,37 +3031,33 @@ public class Editor {
		setShowAsAction(
		MenuItem.SHOW_AS_ACTION_ALWAYS \| MenuItem.SHOW_AS_ACTION_WITH_TEXT);

		if (mTextView.isSuggestionsEnabled() && isCursorInsideSuggestionSpan()) {
		menu.add(0, TextView.ID_REPLACE, 0, com.android.internal.R.string.replace).
		setShowAsAction(
		MenuItem.SHOW_AS_ACTION_ALWAYS \| MenuItem.SHOW_AS_ACTION_WITH_TEXT);
		}
		updateReplaceItem(menu);

		styledAttributes.recycle();

		if (mCustomSelectionActionModeCallback != null) {
		if (!mCustomSelectionActionModeCallback.onCreateActionMode(mode, menu)) {
		// The custom mode can choose to cancel the action mode
		return false;
		}
		}

		if (menu.hasVisibleItems() \|\| mode.getCustomView() != null) {
		mTextView.setHasTransientState(true);
		return true;
		} else {
		return false;
		}
		}

		@Override
		public boolean onPrepareActionMode(ActionMode mode, Menu menu) {
		updateReplaceItem(menu);

		if (mCustomSelectionActionModeCallback != null) {
		return mCustomSelectionActionModeCallback.onPrepareActionMode(mode, menu);
		}
		return true;
		}

		private void updateReplaceItem(Menu menu) {
		boolean canReplace = mTextView.isSuggestionsEnabled() && isCursorInsideSuggestionSpan();
		boolean replaceItemExists = menu.findItem(TextView.ID_REPLACE) != null;
		if (canReplace && !replaceItemExists) {
		menu.add(0, TextView.ID_REPLACE, 0, com.android.internal.R.string.replace).
		setShowAsAction(
		MenuItem.SHOW_AS_ACTION_ALWAYS \| MenuItem.SHOW_AS_ACTION_WITH_TEXT);
		} else if (!canReplace && replaceItemExists) {
		menu.removeItem(TextView.ID_REPLACE);
		}
		}

		@Override
		public boolean onActionItemClicked(ActionMode mode, MenuItem item) {
		if (mCustomSelectionActionModeCallback != null &&
		@@ -3798,6 +3813,9 @@ public class Editor {
		Selection.setSelection((Spannable) mTextView.getText(), offset,
		mTextView.getSelectionEnd());
		updateDrawable();
		if (mSelectionActionMode != null) {
		mSelectionActionMode.invalidate();
		}
		}

		@Override
		@@ -3900,6 +3918,9 @@ public class Editor {
		public void updateSelection(int offset) {
		Selection.setSelection((Spannable) mTextView.getText(),
		mTextView.getSelectionStart(), offset);
		if (mSelectionActionMode != null) {
		mSelectionActionMode.invalidate();
		}
		updateDrawable();
		}