Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure OVERTYPE event has an entity type.

Browse Source 
Bug: 145282510
Test: atest FrameworksCoreTests:android.widget.TextViewActivityTest
Change-Id: Ia064318198effbdfde00566c6746ab922573c32d
This commit is contained in:
Joanne Chung
2019-12-26 11:20:30 +08:00
parent 693a492cfc
commit a4099aaa01
2 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/view/textclassifier/TextClassificationSession.java
View File

@@ -20,6 +20,7 @@ import android.annotation.WorkerThread;
import android.view.textclassifier.SelectionEvent.InvocationMethod;
import com.android.internal.util.Preconditions;
import java.util.Objects;
/**
@@ -183,6 +184,7 @@ final class TextClassificationSession implements TextClassifier {
mSmartEvent = event;
break;
case SelectionEvent.ACTION_ABANDON:
case SelectionEvent.ACTION_OVERTYPE:
if (mPrevEvent != null) {
event.setEntityType(mPrevEvent.getEntityType());
}

60
core/tests/coretests/src/android/widget/TextViewActivityTest.java
View File

@@ -1022,23 +1022,11 @@ public class TextViewActivityTest {
@Test
public void testSelectionMetricsLogger_abandonEventIncludesEntityType() throws Throwable {
final List<SelectionEvent> selectionEvents = new ArrayList<>();
final TextClassifier classifier = new TextClassifier() {
@Override
public void onSelectionEvent(SelectionEvent event) {
selectionEvents.add(event);
}
@Override
public TextSelection suggestSelection(TextSelection.Request request) {
return new TextSelection.Builder(request.getStartIndex(), request.getEndIndex())
.setEntityType(TextClassifier.TYPE_PHONE, 1)
.build();
}
};
final TestableTextClassifier classifier = new TestableTextClassifier();
final TextView textView = mActivity.findViewById(R.id.textview);
mActivityRule.runOnUiThread(() -> textView.setTextClassifier(classifier));
mInstrumentation.waitForIdleSync();
final String text = "My number is 987654321";
onView(withId(R.id.textview)).perform(replaceText(text));
@@ -1053,6 +1041,7 @@ public class TextViewActivityTest {
long waitTime = 0;
SelectionEvent lastEvent;
do {
final List<SelectionEvent> selectionEvents = classifier.getSelectionEvents();
lastEvent = selectionEvents.get(selectionEvents.size() - 1);
if (lastEvent.getEventType() == SelectionEvent.ACTION_ABANDON) {
break;
@@ -1061,6 +1050,29 @@ public class TextViewActivityTest {
waitTime += pollInterval;
} while (waitTime < abandonDelay * 10);
assertEquals(SelectionEvent.ACTION_ABANDON, lastEvent.getEventType());
}
@Test
public void testSelectionMetricsLogger_overtypeEventIncludesEntityType() throws Throwable {
final TestableTextClassifier classifier = new TestableTextClassifier();
final TextView textView = mActivity.findViewById(R.id.textview);
mActivityRule.runOnUiThread(() -> textView.setTextClassifier(classifier));
mInstrumentation.waitForIdleSync();
final String text = "My number is 987654321";
// Long press to trigger selection
onView(withId(R.id.textview)).perform(replaceText(text));
onView(withId(R.id.textview)).perform(longPressOnTextAtIndex(text.indexOf('9')));
sleepForFloatingToolbarPopup();
// Type over the selection
onView(withId(R.id.textview)).perform(pressKey(KeyEvent.KEYCODE_A));
mInstrumentation.waitForIdleSync();
final List<SelectionEvent> selectionEvents = classifier.getSelectionEvents();
final SelectionEvent lastEvent = selectionEvents.get(selectionEvents.size() - 1);
assertEquals(SelectionEvent.ACTION_OVERTYPE, lastEvent.getEventType());
assertEquals(TextClassifier.TYPE_PHONE, lastEvent.getEntityType());
}
@@ -1115,4 +1127,24 @@ public class TextViewActivityTest {
private enum TextStyle {
PLAIN, STYLED
}
private final class TestableTextClassifier implements TextClassifier {
final List<SelectionEvent> mSelectionEvents = new ArrayList<>();
@Override
public void onSelectionEvent(SelectionEvent event) {
mSelectionEvents.add(event);
}
@Override
public TextSelection suggestSelection(TextSelection.Request request) {
return new TextSelection.Builder(request.getStartIndex(), request.getEndIndex())
.setEntityType(TextClassifier.TYPE_PHONE, 1)
.build();
}
List<SelectionEvent> getSelectionEvents() {
return mSelectionEvents;
}
}
}