Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev (de5cdeba) · Commits · e / os / android_frameworks_base

core/java/android/widget/Editor.java

+9 −1

Original line number	Diff line number	Diff line
		@@ -1756,6 +1756,12 @@ public class Editor {
		if (!checkFieldAndSelectCurrentWord()) {
		return false;
		}

		// Avoid dismissing the selection if it exists.
		mPreserveDetachedSelection = true;
		stopTextActionMode();
		mPreserveDetachedSelection = false;

		getSelectionController().enterDrag();
		return true;
		}
		@@ -3129,7 +3135,9 @@ public class Editor {
		Callback customCallback = getCustomCallback();
		if (customCallback != null) {
		if (!customCallback.onCreateActionMode(mode, menu)) {
		// The custom mode can choose to cancel the action mode
		// The custom mode can choose to cancel the action mode, dismiss selection.
		Selection.setSelection((Spannable) mTextView.getText(),
		mTextView.getSelectionEnd());
		return false;
		}
		}

+9 −2

Original line number	Diff line number	Diff line
		@@ -9072,9 +9072,16 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener

		switch (id) {
		case ID_SELECT_ALL:
		// This does not enter text selection mode. Text is highlighted, so that it can be
		// bulk edited, like selectAllOnFocus does. Returns true even if text is empty.
		// This starts an action mode if triggered from another action mode. Text is
		// highlighted, so that it can be bulk edited, like selectAllOnFocus does. Returns
		// true even if text is empty.
		boolean shouldRestartActionMode =
		mEditor != null && mEditor.mTextActionMode != null;
		stopTextActionMode();
		selectAllText();
		if (shouldRestartActionMode) {
		mEditor.startSelectionActionMode();
		}
		return true;

		case ID_UNDO: