Merge "Remove misleading API council comments" (9cfff10b) · Commits · e / os / android_frameworks_base

core/java/android/webkit/HttpAuthHandlerImpl.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -270,7 +270,6 @@ class HttpAuthHandlerImpl extends HttpAuthHandler {

		/**
		* Informs the WebView of a new set of credentials.
		* @hide Pending API council review
		*/
		public static void onReceivedCredentials(LoadListener loader,
		String host, String realm, String username, String password) {

core/java/android/webkit/SearchBox.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,7 +29,7 @@ import java.util.List;
		* SearchBox.query() and receive suggestions by registering a listener on the
		* SearchBox object.
		*
		* @hide pending API council approval.
		* @hide
		*/
		public interface SearchBox {
		/**

core/java/android/webkit/WebSettings.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -1459,7 +1459,7 @@ public class WebSettings {
		* @param flag True if the WebView should enable WebWorkers.
		* Note that this flag only affects V8. JSC does not have
		* an equivalent setting.
		* @hide pending api council approval
		* @hide
		*/
		public synchronized void setWorkersEnabled(boolean flag) {
		if (mWorkersEnabled != flag) {
		@@ -1710,7 +1710,7 @@ public class WebSettings {
		* Specify the maximum decoded image size. The default is
		* 2 megs for small memory devices and 8 megs for large memory devices.
		* @param size The maximum decoded size, or zero to set to the default.
		* @hide pending api council approval
		* @hide
		*/
		public void setMaximumDecodedImageSize(long size) {
		if (mMaximumDecodedImageSize != size) {

core/java/android/webkit/WebStorage.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -362,7 +362,7 @@ public final class WebStorage {
		/**
		* Sets the maximum size of the ApplicationCache.
		* This should only ever be called on the WebKit thread.
		* @hide Pending API council approval
		* @hide
		*/
		public void setAppCacheMaximumSize(long size) {
		nativeSetAppCacheMaximumSize(size);

core/java/android/webkit/WebView.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -1069,7 +1069,7 @@ public class WebView extends AbsoluteLayout
		* @param defStyle The default style resource ID.
		* @param javaScriptInterfaces is a Map of interface names, as keys, and
		* object implementing those interfaces, as values.
		* @hide pending API council approval.
		* @hide This is an implementation detail.
		*/
		protected WebView(Context context, AttributeSet attrs, int defStyle,
		Map<String, Object> javaScriptInterfaces, boolean privateBrowsing) {
		@@ -1734,7 +1734,7 @@ public class WebView extends AbsoluteLayout
		*
		* @param flags JS engine flags in a String
		*
		* @hide pending API solidification
		* @hide This is an implementation detail.
		*/
		public void setJsFlags(String flags) {
		checkThread();
		@@ -4016,7 +4016,7 @@ public class WebView extends AbsoluteLayout
		* Gets the WebViewClient
		* @return the current WebViewClient instance.
		*
		*@hide pending API council approval.
		* @hide This is an implementation detail.
		*/
		public WebViewClient getWebViewClient() {
		return mCallbackProxy.getWebViewClient();
		@@ -4048,7 +4048,7 @@ public class WebView extends AbsoluteLayout
		* Gets the chrome handler.
		* @return the current WebChromeClient instance.
		*
		* @hide API council approval.
		* @hide This is an implementation detail.
		*/
		public WebChromeClient getWebChromeClient() {
		return mCallbackProxy.getWebChromeClient();
		@@ -4431,7 +4431,7 @@ public class WebView extends AbsoluteLayout
		/**
		* Select the word at the last click point.
		*
		* @hide pending API council approval
		* @hide This is an implementation detail.
		*/
		public boolean selectText() {
		int x = viewToContentX(mLastTouchX + mScrollX);
		@@ -5569,7 +5569,7 @@ public class WebView extends AbsoluteLayout
		/**
		* Select all of the text in this WebView.
		*
		* @hide pending API council approval.
		* @hide This is an implementation detail.
		*/
		public void selectAll() {
		if (0 == mNativeClass) return; // client isn't initialized
		@@ -5612,7 +5612,7 @@ public class WebView extends AbsoluteLayout
		/**
		* Copy the selection to the clipboard
		*
		* @hide pending API council approval.
		* @hide This is an implementation detail.
		*/
		public boolean copySelection() {
		boolean copiedSomething = false;
		@@ -5634,7 +5634,7 @@ public class WebView extends AbsoluteLayout
		}

		/**
		* @hide pending API Council approval.
		* @hide This is an implementation detail.
		*/
		public SearchBox getSearchBox() {
		if ((mWebViewCore == null) \|\| (mWebViewCore.getBrowserFrame() == null)) {