Merge "TextClassifier: add API to WebView" into oc-dev (e4776416) · Commits · e / os / android_frameworks_base

api/current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -48831,6 +48831,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();
		@@ -48877,6 +48878,7 @@ 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

+4 −0

Original line number	Diff line number	Diff line
		@@ -52382,6 +52382,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();
		@@ -52429,6 +52430,7 @@ 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);
		@@ -52670,6 +52672,7 @@ package android.webkit {
		method public abstract float getScale();
		method public abstract android.webkit.WebViewProvider.ScrollDelegate getScrollDelegate();
		method public abstract android.webkit.WebSettings getSettings();
		method public default android.view.textclassifier.TextClassifier getTextClassifier();
		method public abstract java.lang.String getTitle();
		method public abstract java.lang.String getTouchIconUrl();
		method public abstract java.lang.String getUrl();
		@@ -52722,6 +52725,7 @@ package android.webkit {
		method public abstract void setNetworkAvailable(boolean);
		method public abstract void setPictureListener(android.webkit.WebView.PictureListener);
		method public abstract void setRendererPriorityPolicy(int, boolean);
		method public default void setTextClassifier(android.view.textclassifier.TextClassifier);
		method public abstract void setVerticalScrollbarOverlay(boolean);
		method public abstract void setWebChromeClient(android.webkit.WebChromeClient);
		method public abstract void setWebViewClient(android.webkit.WebViewClient);

api/test-current.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -49214,6 +49214,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();
		@@ -49260,6 +49261,7 @@ 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

+19 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.webkit;

		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.Widget;
		import android.content.Context;
		@@ -58,6 +59,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
		import android.view.accessibility.AccessibilityNodeProvider;
		import android.view.inputmethod.EditorInfo;
		import android.view.inputmethod.InputConnection;
		import android.view.textclassifier.TextClassifier;
		import android.widget.AbsoluteLayout;

		import java.io.BufferedWriter;
		@@ -2249,6 +2251,23 @@ public class WebView extends AbsoluteLayout
		public boolean getRendererPriorityWaivedWhenNotVisible() {
		return mProvider.getRendererPriorityWaivedWhenNotVisible();
		}

		/**
		* Sets the {@link TextClassifier} for this WebView.
		*/
		public void setTextClassifier(@Nullable TextClassifier textClassifier) {
		mProvider.setTextClassifier(textClassifier);
		}

		/**
		* Returns the {@link TextClassifier} used by this WebView.
		* If no TextClassifier has been set, this WebView uses the default set by the system.
		*/
		@NonNull
		public TextClassifier getTextClassifier() {
		return mProvider.getTextClassifier();
		}

		//-------------------------------------------------------------------------
		// Interface for WebView providers
		//-------------------------------------------------------------------------

core/java/android/webkit/WebViewProvider.java

+9 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.webkit;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.content.res.Configuration;
		import android.content.Intent;
		@@ -41,6 +43,7 @@ import android.view.accessibility.AccessibilityNodeInfo;
		import android.view.accessibility.AccessibilityNodeProvider;
		import android.view.inputmethod.EditorInfo;
		import android.view.inputmethod.InputConnection;
		import android.view.textclassifier.TextClassifier;
		import android.webkit.WebView.HitTestResult;
		import android.webkit.WebView.PictureListener;
		import android.webkit.WebView.VisualStateCallback;
		@@ -275,6 +278,12 @@ public interface WebViewProvider {

		public boolean getRendererPriorityWaivedWhenNotVisible();

		@SuppressWarnings("unused")
		public default void setTextClassifier(@Nullable TextClassifier textClassifier) {}

		@NonNull
		public default TextClassifier getTextClassifier() { return TextClassifier.NO_OP; }

		//-------------------------------------------------------------------------
		// Provider internal methods
		//-------------------------------------------------------------------------