Merge "End the TC session on terminal selection event actions" into pi-dev (6826a4ab) · Commits · e / os / android_frameworks_base

core/java/android/widget/SelectionActionModeHelper.java

+33 −23

Original line number	Original line	Diff line number	Diff line
	@@ -641,7 +641,7 @@ public final class SelectionActionModeHelper {
	mSelectionStart, mSelectionEnd,		mSelectionStart, mSelectionEnd,
	SelectionEvent.ACTION_ABANDON, null /* classification */);		SelectionEvent.ACTION_ABANDON, null /* classification */);
	mSelectionStart = mSelectionEnd = -1;		mSelectionStart = mSelectionEnd = -1;
	mTextView.getTextClassificationSession().destroy();		mLogger.endTextClassificationSession();
	mIsPending = false;		mIsPending = false;
	}		}
	}		}
	@@ -707,8 +707,10 @@ public final class SelectionActionModeHelper {
	mTokenIterator.setText(mText);		mTokenIterator.setText(mText);
	mStartIndex = index;		mStartIndex = index;
	mClassificationSession = classificationSession;		mClassificationSession = classificationSession;
			if (hasActiveClassificationSession()) {
	mClassificationSession.onSelectionEvent(		mClassificationSession.onSelectionEvent(
	SelectionEvent.createSelectionStartedEvent(invocationMethod, 0));		SelectionEvent.createSelectionStartedEvent(invocationMethod, 0));
			}
	} catch (Exception e) {		} catch (Exception e) {
	// Avoid crashes due to logging.		// Avoid crashes due to logging.
	Log.e(LOG_TAG, "" + e.getMessage(), e);		Log.e(LOG_TAG, "" + e.getMessage(), e);
	@@ -718,23 +720,19 @@ public final class SelectionActionModeHelper {
	public void logSelectionModified(int start, int end,		public void logSelectionModified(int start, int end,
	@Nullable TextClassification classification, @Nullable TextSelection selection) {		@Nullable TextClassification classification, @Nullable TextSelection selection) {
	try {		try {
			if (hasActiveClassificationSession()) {
	Preconditions.checkArgumentInRange(start, 0, mText.length(), "start");		Preconditions.checkArgumentInRange(start, 0, mText.length(), "start");
	Preconditions.checkArgumentInRange(end, start, mText.length(), "end");		Preconditions.checkArgumentInRange(end, start, mText.length(), "end");
	int[] wordIndices = getWordDelta(start, end);		int[] wordIndices = getWordDelta(start, end);
	if (selection != null) {		if (selection != null) {
	if (mClassificationSession != null) {
	mClassificationSession.onSelectionEvent(		mClassificationSession.onSelectionEvent(
	SelectionEvent.createSelectionModifiedEvent(		SelectionEvent.createSelectionModifiedEvent(
	wordIndices[0], wordIndices[1], selection));		wordIndices[0], wordIndices[1], selection));
	}
	} else if (classification != null) {		} else if (classification != null) {
	if (mClassificationSession != null) {
	mClassificationSession.onSelectionEvent(		mClassificationSession.onSelectionEvent(
	SelectionEvent.createSelectionModifiedEvent(		SelectionEvent.createSelectionModifiedEvent(
	wordIndices[0], wordIndices[1], classification));		wordIndices[0], wordIndices[1], classification));
	}
	} else {		} else {
	if (mClassificationSession != null) {
	mClassificationSession.onSelectionEvent(		mClassificationSession.onSelectionEvent(
	SelectionEvent.createSelectionModifiedEvent(		SelectionEvent.createSelectionModifiedEvent(
	wordIndices[0], wordIndices[1]));		wordIndices[0], wordIndices[1]));
	@@ -751,21 +749,23 @@ public final class SelectionActionModeHelper {
	@SelectionEvent.ActionType int action,		@SelectionEvent.ActionType int action,
	@Nullable TextClassification classification) {		@Nullable TextClassification classification) {
	try {		try {
			if (hasActiveClassificationSession()) {
	Preconditions.checkArgumentInRange(start, 0, mText.length(), "start");		Preconditions.checkArgumentInRange(start, 0, mText.length(), "start");
	Preconditions.checkArgumentInRange(end, start, mText.length(), "end");		Preconditions.checkArgumentInRange(end, start, mText.length(), "end");
	int[] wordIndices = getWordDelta(start, end);		int[] wordIndices = getWordDelta(start, end);
	if (classification != null) {		if (classification != null) {
	if (mClassificationSession != null) {
	mClassificationSession.onSelectionEvent(		mClassificationSession.onSelectionEvent(
	SelectionEvent.createSelectionActionEvent(		SelectionEvent.createSelectionActionEvent(
	wordIndices[0], wordIndices[1], action, classification));		wordIndices[0], wordIndices[1], action,
	}		classification));
	} else {		} else {
	if (mClassificationSession != null) {
	mClassificationSession.onSelectionEvent(		mClassificationSession.onSelectionEvent(
	SelectionEvent.createSelectionActionEvent(		SelectionEvent.createSelectionActionEvent(
	wordIndices[0], wordIndices[1], action));		wordIndices[0], wordIndices[1], action));
	}		}
			if (SelectionEvent.isTerminal(action)) {
			endTextClassificationSession();
			}
	}		}
	} catch (Exception e) {		} catch (Exception e) {
	// Avoid crashes due to logging.		// Avoid crashes due to logging.
	@@ -777,6 +777,16 @@ public final class SelectionActionModeHelper {
	return mEditTextLogger;		return mEditTextLogger;
	}		}

			public void endTextClassificationSession() {
			if (hasActiveClassificationSession()) {
			mClassificationSession.destroy();
			}
			}

			private boolean hasActiveClassificationSession() {
			return mClassificationSession != null && !mClassificationSession.isDestroyed();
			}

	private int[] getWordDelta(int start, int end) {		private int[] getWordDelta(int start, int end) {
	int[] wordIndices = new int[2];		int[] wordIndices = new int[2];

core/java/android/widget/TextView.java

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -11527,12 +11527,9 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
	} else {		} else {
	widgetType = TextClassifier.WIDGET_TYPE_UNSELECTABLE_TEXTVIEW;		widgetType = TextClassifier.WIDGET_TYPE_UNSELECTABLE_TEXTVIEW;
	}		}
	// TODO: Tagged this widgetType with a * so it we can monitor if it reports
	// SelectionEvents exactly as the older Logger does. Remove once investigations
	// are complete.
	final TextClassificationContext textClassificationContext =		final TextClassificationContext textClassificationContext =
	new TextClassificationContext.Builder(		new TextClassificationContext.Builder(
	mContext.getPackageName(), "*" + widgetType)		mContext.getPackageName(), widgetType)
	.build();		.build();
	if (mTextClassifier != null) {		if (mTextClassifier != null) {
	mTextClassificationSession = tcm.createTextClassificationSession(		mTextClassificationSession = tcm.createTextClassificationSession(

core/tests/coretests/src/android/widget/TextViewActivityTest.java

+29 −0

Original line number	Original line	Diff line number	Diff line
	@@ -46,6 +46,7 @@ import static android.widget.espresso.TextViewAssertions.doesNotHaveStyledText;
	import static android.widget.espresso.TextViewAssertions.hasInsertionPointerAtIndex;		import static android.widget.espresso.TextViewAssertions.hasInsertionPointerAtIndex;
	import static android.widget.espresso.TextViewAssertions.hasSelection;		import static android.widget.espresso.TextViewAssertions.hasSelection;

			import static junit.framework.Assert.assertEquals;
	import static junit.framework.Assert.assertFalse;		import static junit.framework.Assert.assertFalse;
	import static junit.framework.Assert.assertTrue;		import static junit.framework.Assert.assertTrue;

	@@ -77,6 +78,7 @@ import android.view.ActionMode;
	import android.view.KeyEvent;		import android.view.KeyEvent;
	import android.view.Menu;		import android.view.Menu;
	import android.view.MenuItem;		import android.view.MenuItem;
			import android.view.textclassifier.SelectionEvent;
	import android.view.textclassifier.TextClassificationManager;		import android.view.textclassifier.TextClassificationManager;
	import android.view.textclassifier.TextClassifier;		import android.view.textclassifier.TextClassifier;
	import android.view.textclassifier.TextLinks;		import android.view.textclassifier.TextLinks;
	@@ -90,6 +92,9 @@ import org.junit.Rule;
	import org.junit.Test;		import org.junit.Test;
	import org.junit.runner.RunWith;		import org.junit.runner.RunWith;

			import java.util.ArrayList;
			import java.util.List;

	/**		/**
	* Tests the TextView widget from an Activity		* Tests the TextView widget from an Activity
	*/		*/
	@@ -977,6 +982,30 @@ public class TextViewActivityTest {
	assertFloatingToolbarDoesNotContainItem(android.R.id.textAssist);		assertFloatingToolbarDoesNotContainItem(android.R.id.textAssist);
	}		}

			@Test
			public void testSelectionMetricsLogger_noAbandonAfterCopy() throws Throwable {
			final List<SelectionEvent> selectionEvents = new ArrayList<>();
			final TextClassifier classifier = new TextClassifier() {
			@Override
			public void onSelectionEvent(SelectionEvent event) {
			selectionEvents.add(event);
			}
			};
			final TextView textView = mActivity.findViewById(R.id.textview);
			mActivityRule.runOnUiThread(() -> textView.setTextClassifier(classifier));
			mInstrumentation.waitForIdleSync();
			final String text = "andyroid@android.com";

			onView(withId(R.id.textview)).perform(replaceText(text));
			onView(withId(R.id.textview)).perform(longPressOnTextAtIndex(text.indexOf('@')));
			sleepForFloatingToolbarPopup();
			clickFloatingToolbarItem(mActivity.getString(com.android.internal.R.string.copy));
			mInstrumentation.waitForIdleSync();

			final SelectionEvent lastEvent = selectionEvents.get(selectionEvents.size() - 1);
			assertEquals(SelectionEvent.ACTION_COPY, lastEvent.getEventType());
			}

	@Test		@Test
	public void testPastePlainText_menuAction() {		public void testPastePlainText_menuAction() {
	initializeClipboardWithText(TextStyle.STYLED);		initializeClipboardWithText(TextStyle.STYLED);