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

Merge "Increase the duration allowed for a TC result." into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-29 23:08:50 +00:00
committed by Android (Google) Code Review
parent 22f7ae8d07 be60f06a1b
commit f85cd339c7
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
core/java/android/widget/SelectionActionModeHelper.java
View File

@@ -51,12 +51,6 @@ final class SelectionActionModeHelper {
private static final String LOG_TAG = "SelectActionModeHelper"; private static final String LOG_TAG = "SelectActionModeHelper";
/**
* Maximum time (in milliseconds) to wait for a result before timing out.
*/
// TODO: Consider making this a ViewConfiguration.
private static final int TIMEOUT_DURATION = 200;
private final Editor mEditor; private final Editor mEditor;
private final TextView mTextView; private final TextView mTextView;
private final TextClassificationHelper mTextClassificationHelper; private final TextClassificationHelper mTextClassificationHelper;
@@ -89,7 +83,7 @@ final class SelectionActionModeHelper {
resetTextClassificationHelper(); resetTextClassificationHelper();
mTextClassificationAsyncTask = new TextClassificationAsyncTask( mTextClassificationAsyncTask = new TextClassificationAsyncTask(
mTextView, mTextView,
TIMEOUT_DURATION, mTextClassificationHelper.getTimeoutDuration(),
adjustSelection adjustSelection
? mTextClassificationHelper::suggestSelection ? mTextClassificationHelper::suggestSelection
: mTextClassificationHelper::classifyText, : mTextClassificationHelper::classifyText,
@@ -106,7 +100,7 @@ final class SelectionActionModeHelper {
resetTextClassificationHelper(); resetTextClassificationHelper();
mTextClassificationAsyncTask = new TextClassificationAsyncTask( mTextClassificationAsyncTask = new TextClassificationAsyncTask(
mTextView, mTextView,
TIMEOUT_DURATION, mTextClassificationHelper.getTimeoutDuration(),
mTextClassificationHelper::classifyText, mTextClassificationHelper::classifyText,
this::invalidateActionMode) this::invalidateActionMode)
.execute(); .execute();
@@ -538,7 +532,7 @@ final class SelectionActionModeHelper {
private static final class TextClassificationAsyncTask private static final class TextClassificationAsyncTask
extends AsyncTask<Void, Void, SelectionResult> { extends AsyncTask<Void, Void, SelectionResult> {
private final int mTimeOutDuration; private final long mTimeOutDuration;
private final Supplier<SelectionResult> mSelectionResultSupplier; private final Supplier<SelectionResult> mSelectionResultSupplier;
private final Consumer<SelectionResult> mSelectionResultCallback; private final Consumer<SelectionResult> mSelectionResultCallback;
private final TextView mTextView; private final TextView mTextView;
@@ -551,7 +545,7 @@ final class SelectionActionModeHelper {
* @param selectionResultCallback receives the selection results. Runs on the UiThread * @param selectionResultCallback receives the selection results. Runs on the UiThread
*/ */
TextClassificationAsyncTask( TextClassificationAsyncTask(
@NonNull TextView textView, int timeOut, @NonNull TextView textView, long timeOut,
@NonNull Supplier<SelectionResult> selectionResultSupplier, @NonNull Supplier<SelectionResult> selectionResultSupplier,
@NonNull Consumer<SelectionResult> selectionResultCallback) { @NonNull Consumer<SelectionResult> selectionResultCallback) {
super(textView != null ? textView.getHandler() : null); super(textView != null ? textView.getHandler() : null);
@@ -623,6 +617,9 @@ final class SelectionActionModeHelper {
private LocaleList mLastClassificationLocales; private LocaleList mLastClassificationLocales;
private SelectionResult mLastClassificationResult; private SelectionResult mLastClassificationResult;
/** Whether the TextClassifier has been initialized. */
private boolean mHot;
TextClassificationHelper(TextClassifier textClassifier, TextClassificationHelper(TextClassifier textClassifier,
CharSequence text, int selectionStart, int selectionEnd, LocaleList locales) { CharSequence text, int selectionStart, int selectionEnd, LocaleList locales) {
reset(textClassifier, text, selectionStart, selectionEnd, locales); reset(textClassifier, text, selectionStart, selectionEnd, locales);
@@ -642,11 +639,13 @@ final class SelectionActionModeHelper {
@WorkerThread @WorkerThread
public SelectionResult classifyText() { public SelectionResult classifyText() {
return performClassification(null); mHot = true;
return performClassification(null /* selection */);
} }
@WorkerThread @WorkerThread
public SelectionResult suggestSelection() { public SelectionResult suggestSelection() {
mHot = true;
trimText(); trimText();
final TextSelection selection = mTextClassifier.suggestSelection( final TextSelection selection = mTextClassifier.suggestSelection(
mTrimmedText, mRelativeStart, mRelativeEnd, mLocales); mTrimmedText, mRelativeStart, mRelativeEnd, mLocales);
@@ -655,6 +654,22 @@ final class SelectionActionModeHelper {
return performClassification(selection); return performClassification(selection);
} }
/**
* Maximum time (in milliseconds) to wait for a textclassifier result before timing out.
*/
// TODO: Consider making this a ViewConfiguration.
public long getTimeoutDuration() {
if (mHot) {
return 200;
} else {
// Return a slightly larger number than usual when the TextClassifier is first
// initialized. Initialization would usually take longer than subsequent calls to
// the TextClassifier. The impact of this on the UI is that we do not show the
// selection handles or toolbar until after this timeout.
return 500;
}
}
private SelectionResult performClassification(@Nullable TextSelection selection) { private SelectionResult performClassification(@Nullable TextSelection selection) {
if (!Objects.equals(mText, mLastClassificationText) if (!Objects.equals(mText, mLastClassificationText)
|| mSelectionStart != mLastClassificationSelectionStart || mSelectionStart != mLastClassificationSelectionStart