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

Commit 07fa4544 authored by Tima Vaisburd's avatar Tima Vaisburd Committed by android-build-merger
Browse files

Merge "Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev am:... 

Merge "Merge "Unhide get/setTextClassifier in WebView" into oc-mr1-dev am: 2ebddfc3" into oc-mr1-dev-plus-aosp
am: 6a6275a8

Change-Id: I46dab838a4c5a0150f6773dee482f75c9ecf237f
parents 3960b69f 6a6275a8

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -49088,6 +49088,7 @@ 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();
@@ -49136,6 +49137,7 @@ package android.webkit { 
    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);

    method public void setRendererPriorityPolicy(int, boolean);

    method public static void setSafeBrowsingWhitelist(java.util.List<java.lang.String>, android.webkit.ValueCallback<java.lang.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

+2 −0
Original line number Diff line number Diff line
@@ -52847,6 +52847,7 @@ 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();
@@ -52896,6 +52897,7 @@ package android.webkit { 
    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);

    method public void setRendererPriorityPolicy(int, boolean);

    method public static void setSafeBrowsingWhitelist(java.util.List<java.lang.String>, android.webkit.ValueCallback<java.lang.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

+2 −0
Original line number Diff line number Diff line
@@ -49542,6 +49542,7 @@ 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();
@@ -49590,6 +49591,7 @@ package android.webkit { 
    method public deprecated void setPictureListener(android.webkit.WebView.PictureListener);

    method public void setRendererPriorityPolicy(int, boolean);

    method public static void setSafeBrowsingWhitelist(java.util.List<java.lang.String>, android.webkit.ValueCallback<java.lang.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

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


    /**

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

     * @hide

     */

    public void setTextClassifier(@Nullable TextClassifier textClassifier) {

        mProvider.setTextClassifier(textClassifier);
@@ -2298,7 +2297,6 @@ 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() {