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

Commit 2858ad3a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "TextClassifier cleanup."

parents 06ed84f7 9841ea07

api/removed.txt

+0 −10
Original line number Diff line number Diff line
@@ -380,16 +380,6 @@ package android.view { 


}



package android.view.textclassifier {



  public abstract interface TextClassifier {

    method public abstract android.view.textclassifier.LinksInfo getLinks(java.lang.CharSequence, int);

    method public abstract android.view.textclassifier.TextClassificationResult getTextClassificationResult(java.lang.CharSequence, int, int);

    method public abstract android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int);

  }



}



package android.webkit {



  public class WebViewClient {

api/system-removed.txt

+0 −10
Original line number Diff line number Diff line
@@ -374,16 +374,6 @@ package android.view { 


}



package android.view.textclassifier {



  public abstract interface TextClassifier {

    method public abstract android.view.textclassifier.LinksInfo getLinks(java.lang.CharSequence, int);

    method public abstract android.view.textclassifier.TextClassificationResult getTextClassificationResult(java.lang.CharSequence, int, int);

    method public abstract android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int);

  }



}



package android.webkit {



  public class WebViewClient {

api/test-removed.txt

+0 −10
Original line number Diff line number Diff line
@@ -380,16 +380,6 @@ package android.view { 


}



package android.view.textclassifier {



  public abstract interface TextClassifier {

    method public abstract android.view.textclassifier.LinksInfo getLinks(java.lang.CharSequence, int);

    method public abstract android.view.textclassifier.TextClassificationResult getTextClassificationResult(java.lang.CharSequence, int, int);

    method public abstract android.view.textclassifier.TextSelection suggestSelection(java.lang.CharSequence, int, int);

  }



}



package android.webkit {



  public class WebViewClient {

core/java/android/view/textclassifier/TextClassifier.java

+0 −32
Original line number Diff line number Diff line
@@ -70,26 +70,6 @@ public interface TextClassifier { 
        public LinksInfo getLinks(CharSequence text, int linkMask, LocaleList defaultLocales) {

            return LinksInfo.NO_OP;

        }



        // TODO: Remove

        @Override

        public TextSelection suggestSelection(

                CharSequence text, int selectionStartIndex, int selectionEndIndex) {

            throw new UnsupportedOperationException("Removed");

        }



        // TODO: Remove

        @Override

        public TextClassificationResult getTextClassificationResult(

                CharSequence text, int startIndex, int endIndex) {

            throw new UnsupportedOperationException("Removed");

        }



        // TODO: Remove

        @Override

        public LinksInfo getLinks(CharSequence text, int linkMask) {

            throw new UnsupportedOperationException("Removed");

        }

    };



    /**
@@ -154,16 +134,4 @@ public interface TextClassifier { 
     */

    LinksInfo getLinks(

            @NonNull CharSequence text, int linkMask, @Nullable LocaleList defaultLocales);



    // TODO: Remove

    /** @removed */

    TextSelection suggestSelection(

            CharSequence text, int selectionStartIndex, int selectionEndIndex);

    // TODO: Remove

    /** @removed */

    TextClassificationResult getTextClassificationResult(

            CharSequence text, int startIndex, int endIndex);

    // TODO: Remove

    /** @removed */

    LinksInfo getLinks(CharSequence text, int linkMask);

}

core/java/android/view/textclassifier/TextClassifierImpl.java

+4 −22
Original line number Diff line number Diff line
@@ -120,10 +120,12 @@ final class TextClassifierImpl implements TextClassifier { 
                SmartSelection.ClassificationResult[] results = getSmartSelection()

                        .classifyText(text.toString(), startIndex, endIndex);

                if (results.length > 0) {

                    final TextClassificationResult classificationResult =

                            createClassificationResult(results, classified);

                    // TODO: Added this log for debug only. Remove before release.

                    Log.d(LOG_TAG, String.format(

                            "Classification type: %s", getHighestScoringType(results)));

                    return createClassificationResult(results, classified);

                            "Classification type: %s", classificationResult));

                    return classificationResult;

                }

            }

        } catch (Throwable t) {
@@ -149,26 +151,6 @@ final class TextClassifierImpl implements TextClassifier { 
        return TextClassifier.NO_OP.getLinks(text, linkMask, defaultLocales);

    }



    // TODO: Remove

    @Override

    public TextSelection suggestSelection(

            CharSequence text, int selectionStartIndex, int selectionEndIndex) {

        throw new UnsupportedOperationException("Removed");

    }



    // TODO: Remove

    @Override

    public TextClassificationResult getTextClassificationResult(

            CharSequence text, int startIndex, int endIndex) {

        throw new UnsupportedOperationException("Removed");

    }



    // TODO: Remove

    @Override

    public LinksInfo getLinks(CharSequence text, int linkMask) {

        throw new UnsupportedOperationException("Removed");

    }



    private SmartSelection getSmartSelection() throws FileNotFoundException {

        synchronized (mSmartSelectionLock) {

            if (mSmartSelection == null) {