Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3521f3f4 authored by Abodunrinwa Toki's avatar Abodunrinwa Toki
Browse files

Increase the duration allowed for a TC result. 

Increase the duration allowed for a TextClassifier (TC) result when
it is being initialized for the first time.
Initialization typically takes more time that other calls to the TC.
A timeout during initialization means the user doesn't see the
effect of running the TC the first time. Subsequent calls typically
work fine as they're less likely to timeout.
We increase this value only slightly because we don't want the user
waiting too long for a slow TC's result. Finding the right balance
is an art and most likely depends on the TC being used.

Note that although a TextView's TC can change for each individual
call to the TC, such a situation does not benefit from the bump in
the timeout. Again, we really want to discourage larger timeouts.

Bug: 66217281
Test: bit FrameworksCoreTests:android.widget.TextViewActivityTest
Test: bit CtsWidgetTestCases:android.widget.cts.TextViewTest
Test: Manual test:
  - Delayed TextClassifier response by about 150ms (allowing only 50ms for initialization)
  - Before cl: Sometimes the result is not shown to the user the
    first time the textclassifier runs
  - After cl: Results consistently show for even for first
    textclassifier call
Change-Id: Iabc8279fa57ef6a9a2db0c7e9c7e3ab8c131bf02
parent c9512c61

core/java/android/widget/SelectionActionModeHelper.java

+24 −8
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ public final class SelectionActionModeHelper { 


    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 static final boolean SMART_SELECT_ANIMATION_ENABLED = true;



    private final Editor mEditor;
@@ -110,7 +104,7 @@ public final class SelectionActionModeHelper { 
            resetTextClassificationHelper();

            mTextClassificationAsyncTask = new TextClassificationAsyncTask(

                    mTextView,

                    TIMEOUT_DURATION,

                    mTextClassificationHelper.getTimeoutDuration(),

                    adjustSelection

                            ? mTextClassificationHelper::suggestSelection

                            : mTextClassificationHelper::classifyText,
@@ -129,7 +123,7 @@ public final class SelectionActionModeHelper { 
            resetTextClassificationHelper();

            mTextClassificationAsyncTask = new TextClassificationAsyncTask(

                    mTextView,

                    TIMEOUT_DURATION,

                    mTextClassificationHelper.getTimeoutDuration(),

                    mTextClassificationHelper::classifyText,

                    this::invalidateActionMode)

                    .execute();
@@ -257,6 +251,7 @@ public final class SelectionActionModeHelper { 
        return result;

    }



    // TODO: Move public pure functions out of this class and make it package-private.

    /**

     * Merges a {@link RectF} into an existing list of rectangles. While merging, this method

     * makes sure that:
@@ -786,6 +781,9 @@ public final class SelectionActionModeHelper { 
        private LocaleList mLastClassificationLocales;

        private SelectionResult mLastClassificationResult;



        /** Whether the TextClassifier has been initialized. */

        private boolean mHot;



        TextClassificationHelper(TextClassifier textClassifier,

                CharSequence text, int selectionStart, int selectionEnd, LocaleList locales) {

            reset(textClassifier, text, selectionStart, selectionEnd, locales);
@@ -805,11 +803,13 @@ public final class SelectionActionModeHelper { 


        @WorkerThread

        public SelectionResult classifyText() {

            mHot = true;

            return performClassification(null /* selection */);

        }



        @WorkerThread

        public SelectionResult suggestSelection() {

            mHot = true;

            trimText();

            final TextSelection selection = mTextClassifier.suggestSelection(

                    mTrimmedText, mRelativeStart, mRelativeEnd, mLocales);
@@ -818,6 +818,22 @@ public final class SelectionActionModeHelper { 
            return performClassification(selection);

        }



        /**

         * Maximum time (in milliseconds) to wait for a textclassifier result before timing out.

         */

        // TODO: Consider making this a ViewConfiguration.

        public int 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) {

            if (!Objects.equals(mText, mLastClassificationText)

                    || mSelectionStart != mLastClassificationSelectionStart