Merge "Fix typos related to sortSelectionIndices" (5247f041) · Commits · e / os / android_frameworks_base

core/java/android/widget/SelectionActionModeHelper.java

+13 −13

Original line number	Diff line number	Diff line
		@@ -109,7 +109,7 @@ public final class SelectionActionModeHelper {
		*
		* @return the swap result, index 0 is the start index and index 1 is the end index.
		*/
		private static int[] sortSelctionIndices(int selectionStart, int selectionEnd) {
		private static int[] sortSelectionIndices(int selectionStart, int selectionEnd) {
		if (selectionStart < selectionEnd) {
		return new int[]{selectionStart, selectionEnd};
		}
		@@ -123,11 +123,11 @@ public final class SelectionActionModeHelper {
		* @param textView the selected TextView.
		* @return the swap result, index 0 is the start index and index 1 is the end index.
		*/
		private static int[] sortSelctionIndicesFromTextView(TextView textView) {
		private static int[] sortSelectionIndicesFromTextView(TextView textView) {
		int selectionStart = textView.getSelectionStart();
		int selectionEnd = textView.getSelectionEnd();

		return sortSelctionIndices(selectionStart, selectionEnd);
		return sortSelectionIndices(selectionStart, selectionEnd);
		}

		/**
		@@ -136,7 +136,7 @@ public final class SelectionActionModeHelper {
		public void startSelectionActionModeAsync(boolean adjustSelection) {
		// Check if the smart selection should run for editable text.
		adjustSelection &= getTextClassificationSettings().isSmartSelectionEnabled();
		int[] sortedSelectionIndices = sortSelctionIndicesFromTextView(mTextView);
		int[] sortedSelectionIndices = sortSelectionIndicesFromTextView(mTextView);

		mSelectionTracker.onOriginalSelection(
		getText(mTextView),
		@@ -166,7 +166,7 @@ public final class SelectionActionModeHelper {
		* Starts Link ActionMode.
		*/
		public void startLinkActionModeAsync(int start, int end) {
		int[] indexResult = sortSelctionIndices(start, end);
		int[] indexResult = sortSelectionIndices(start, end);
		mSelectionTracker.onOriginalSelection(getText(mTextView), indexResult[0], indexResult[1],
		true /isLink/);
		cancelAsyncTask();
		@@ -202,21 +202,21 @@ public final class SelectionActionModeHelper {

		/** Reports a selection action event. */
		public void onSelectionAction(int menuItemId, @Nullable String actionLabel) {
		int[] sortedSelectionIndices = sortSelctionIndicesFromTextView(mTextView);
		int[] sortedSelectionIndices = sortSelectionIndicesFromTextView(mTextView);
		mSelectionTracker.onSelectionAction(
		sortedSelectionIndices[0], sortedSelectionIndices[1],
		getActionType(menuItemId), actionLabel, mTextClassification);
		}

		public void onSelectionDrag() {
		int[] sortedSelectionIndices = sortSelctionIndicesFromTextView(mTextView);
		int[] sortedSelectionIndices = sortSelectionIndicesFromTextView(mTextView);
		mSelectionTracker.onSelectionAction(
		sortedSelectionIndices[0], sortedSelectionIndices[1],
		SelectionEvent.ACTION_DRAG, /* actionLabel= */ null, mTextClassification);
		}

		public void onTextChanged(int start, int end) {
		int[] sortedSelectionIndices = sortSelctionIndices(start, end);
		int[] sortedSelectionIndices = sortSelectionIndices(start, end);
		mSelectionTracker.onTextChanged(sortedSelectionIndices[0], sortedSelectionIndices[1],
		mTextClassification);
		}
		@@ -335,7 +335,7 @@ public final class SelectionActionModeHelper {
		startSelectionActionMode(startSelectionResult);
		};
		// TODO do not trigger the animation if the change included only non-printable characters
		int[] sortedSelectionIndices = sortSelctionIndicesFromTextView(mTextView);
		int[] sortedSelectionIndices = sortSelectionIndicesFromTextView(mTextView);
		final boolean didSelectionChange =
		result != null && (sortedSelectionIndices[0] != result.mStart
		\|\| sortedSelectionIndices[1] != result.mEnd);
		@@ -488,7 +488,7 @@ public final class SelectionActionModeHelper {
		if (actionMode != null) {
		actionMode.invalidate();
		}
		final int[] sortedSelectionIndices = sortSelctionIndicesFromTextView(mTextView);
		final int[] sortedSelectionIndices = sortSelectionIndicesFromTextView(mTextView);
		mSelectionTracker.onSelectionUpdated(
		sortedSelectionIndices[0], sortedSelectionIndices[1], mTextClassification);
		mTextClassificationAsyncTask = null;
		@@ -497,7 +497,7 @@ public final class SelectionActionModeHelper {
		private void resetTextClassificationHelper(int selectionStart, int selectionEnd) {
		if (selectionStart < 0 \|\| selectionEnd < 0) {
		// Use selection indices
		int[] sortedSelectionIndices = sortSelctionIndicesFromTextView(mTextView);
		int[] sortedSelectionIndices = sortSelectionIndicesFromTextView(mTextView);
		selectionStart = sortedSelectionIndices[0];
		selectionEnd = sortedSelectionIndices[1];
		}
		@@ -639,7 +639,7 @@ public final class SelectionActionModeHelper {
		mAllowReset = false;
		boolean selected = editor.selectCurrentWord();
		if (selected) {
		final int[] sortedSelectionIndices = sortSelctionIndicesFromTextView(textView);
		final int[] sortedSelectionIndices = sortSelectionIndicesFromTextView(textView);
		mSelectionStart = sortedSelectionIndices[0];
		mSelectionEnd = sortedSelectionIndices[1];
		mLogger.logSelectionAction(
		@@ -1216,7 +1216,7 @@ public final class SelectionActionModeHelper {

		SelectionResult(int start, int end,
		@Nullable TextClassification classification, @Nullable TextSelection selection) {
		int[] sortedIndices = sortSelctionIndices(start, end);
		int[] sortedIndices = sortSelectionIndices(start, end);
		mStart = sortedIndices[0];
		mEnd = sortedIndices[1];
		mClassification = classification;