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

Commit 9c14b91a authored by Tima Vaisburd's avatar Tima Vaisburd Committed by Android (Google) Code Review
Browse files

Merge "Hide getTextClassifier and setTextClassifier for WebView" into oc-dev

parents 3a4987bb 2240ea64

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -48936,7 +48936,6 @@ package android.webkit { 
    method public int getRendererRequestedPriority();

    method public deprecated float getScale();

    method public android.webkit.WebSettings getSettings();

    method public android.view.textclassifier.TextClassifier getTextClassifier();

    method public java.lang.String getTitle();

    method public java.lang.String getUrl();

    method public android.webkit.WebChromeClient getWebChromeClient();
@@ -48984,7 +48983,6 @@ package android.webkit { 
    method public void setNetworkAvailable(boolean);

    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);

    method public void setRendererPriorityPolicy(int, boolean);

    method public void setTextClassifier(android.view.textclassifier.TextClassifier);

    method public deprecated void setVerticalScrollbarOverlay(boolean);

    method public void setWebChromeClient(android.webkit.WebChromeClient);

    method public static void setWebContentsDebuggingEnabled(boolean);

api/system-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -52616,7 +52616,6 @@ package android.webkit { 
    method public int getRendererRequestedPriority();

    method public deprecated float getScale();

    method public android.webkit.WebSettings getSettings();

    method public android.view.textclassifier.TextClassifier getTextClassifier();

    method public java.lang.String getTitle();

    method public java.lang.String getUrl();

    method public android.webkit.WebChromeClient getWebChromeClient();
@@ -52665,7 +52664,6 @@ package android.webkit { 
    method public void setNetworkAvailable(boolean);

    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);

    method public void setRendererPriorityPolicy(int, boolean);

    method public void setTextClassifier(android.view.textclassifier.TextClassifier);

    method public deprecated void setVerticalScrollbarOverlay(boolean);

    method public void setWebChromeClient(android.webkit.WebChromeClient);

    method public static void setWebContentsDebuggingEnabled(boolean);

api/test-current.txt

+0 −2
Original line number Diff line number Diff line
@@ -49315,7 +49315,6 @@ package android.webkit { 
    method public int getRendererRequestedPriority();

    method public deprecated float getScale();

    method public android.webkit.WebSettings getSettings();

    method public android.view.textclassifier.TextClassifier getTextClassifier();

    method public java.lang.String getTitle();

    method public java.lang.String getUrl();

    method public android.webkit.WebChromeClient getWebChromeClient();
@@ -49363,7 +49362,6 @@ package android.webkit { 
    method public void setNetworkAvailable(boolean);

    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);

    method public void setRendererPriorityPolicy(int, boolean);

    method public void setTextClassifier(android.view.textclassifier.TextClassifier);

    method public deprecated void setVerticalScrollbarOverlay(boolean);

    method public void setWebChromeClient(android.webkit.WebChromeClient);

    method public static void setWebContentsDebuggingEnabled(boolean);

core/java/android/webkit/WebView.java

+2 −0
Original line number Diff line number Diff line
@@ -2255,6 +2255,7 @@ public class WebView extends AbsoluteLayout 


    /**

     * Sets the {@link TextClassifier} for this WebView.

     * @hide

     */

    public void setTextClassifier(@Nullable TextClassifier textClassifier) {

        mProvider.setTextClassifier(textClassifier);
@@ -2263,6 +2264,7 @@ public class WebView extends AbsoluteLayout 
    /**

     * Returns the {@link TextClassifier} used by this WebView.

     * If no TextClassifier has been set, this WebView uses the default set by the system.

     * @hide

     */

    @NonNull

    public TextClassifier getTextClassifier() {