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

Commit 04f97ee8 authored by Tima Vaisburd's avatar Tima Vaisburd Committed by android-build-merger
Browse files

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

am: 9c14b91a

Change-Id: Ifaa89f3fd18fff60e8d702b2352e39b9e3dba744
parents 7918ff08 9c14b91a

api/current.txt

+0 −2
Original line number Diff line number Diff line
@@ -48937,7 +48937,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();
@@ -48985,7 +48984,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
@@ -52617,7 +52617,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();
@@ -52666,7 +52665,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
@@ -49332,7 +49332,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();
@@ -49380,7 +49379,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() {