From 0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65 Mon Sep 17 00:00:00 2001 From: Grace Kloba Date: Thu, 22 Oct 2009 12:17:20 -0700 Subject: [PATCH] Remove "@hide pending API council" in webkit to expose the apis to SDK. Remove @hide in GeolocationPermissions and WebStorage to expose them to the SDK users. Remove @hide for freeMemory() in WebView. Remove @hide comment in CallbackProxy and GoogleLocationSettingManager as they are not public class. --- api/current.xml | 604 ++++++++++++++++++ core/java/android/webkit/CacheManager.java | 6 - core/java/android/webkit/CallbackProxy.java | 13 - .../webkit/GeolocationPermissions.java | 6 - .../android/webkit/GeolocationService.java | 3 +- .../webkit/GoogleLocationSettingManager.java | 1 - core/java/android/webkit/MockGeolocation.java | 2 +- core/java/android/webkit/ValueCallback.java | 12 +- core/java/android/webkit/WebChromeClient.java | 13 - core/java/android/webkit/WebSettings.java | 11 - core/java/android/webkit/WebStorage.java | 7 - core/java/android/webkit/WebView.java | 1 - 12 files changed, 611 insertions(+), 68 deletions(-) diff --git a/api/current.xml b/api/current.xml index cb8f800bd7d2b..3ffda954f7fe0 100644 --- a/api/current.xml +++ b/api/current.xml @@ -172888,6 +172888,17 @@ visibility="public" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + callback) { if (mWebChromeClient == null) { return; diff --git a/core/java/android/webkit/GeolocationPermissions.java b/core/java/android/webkit/GeolocationPermissions.java index 483e9e9b9e09d..64a9d9b5ee2a2 100755 --- a/core/java/android/webkit/GeolocationPermissions.java +++ b/core/java/android/webkit/GeolocationPermissions.java @@ -71,7 +71,6 @@ public final class GeolocationPermissions { /** * Gets the singleton instance of the class. - * @hide */ public static GeolocationPermissions getInstance() { if (sInstance == null) { @@ -188,7 +187,6 @@ public final class GeolocationPermissions { * WebCore::SecurityOrigin::toString(). As long as all 'HTML 5 modules' * (Database, Geolocation etc) do so, it's safe to match up origins for the * purposes of displaying UI. - * @hide */ public void getOrigins(ValueCallback callback) { if (callback != null) { @@ -212,7 +210,6 @@ public final class GeolocationPermissions { /** * Gets the permission state for the specified origin. - * @hide */ public void getAllowed(String origin, ValueCallback callback) { if (callback == null) { @@ -245,7 +242,6 @@ public final class GeolocationPermissions { * Clears the permission state for the specified origin. This method may be * called before the WebKit thread has intialized the message handler. * Messages will be queued until this time. - * @hide */ public void clear(String origin) { // Called on the UI thread. @@ -266,7 +262,6 @@ public final class GeolocationPermissions { * Allows the specified origin. This method may be called before the WebKit * thread has intialized the message handler. Messages will be queued until * this time. - * @hide */ public void allow(String origin) { // Called on the UI thread. @@ -285,7 +280,6 @@ public final class GeolocationPermissions { /** * Clears the permission state for all origins. - * @hide */ public void clearAll() { // Called on the UI thread. diff --git a/core/java/android/webkit/GeolocationService.java b/core/java/android/webkit/GeolocationService.java index 646f8c507d36a..24306f407b90a 100755 --- a/core/java/android/webkit/GeolocationService.java +++ b/core/java/android/webkit/GeolocationService.java @@ -30,9 +30,8 @@ import android.webkit.WebViewCore; /** * Implements the Java side of GeolocationServiceAndroid. - * @hide Pending API council review. */ -public final class GeolocationService implements LocationListener { +final class GeolocationService implements LocationListener { // Log tag private static final String TAG = "geolocationService"; diff --git a/core/java/android/webkit/GoogleLocationSettingManager.java b/core/java/android/webkit/GoogleLocationSettingManager.java index 508df3b5ac856..ecac70a127767 100644 --- a/core/java/android/webkit/GoogleLocationSettingManager.java +++ b/core/java/android/webkit/GoogleLocationSettingManager.java @@ -32,7 +32,6 @@ import java.util.HashSet; * Security - Share with Google' and the browser. When this setting is set * to true, we allow Geolocation for Google origins. When this setting is * set to false, we clear Geolocation permissions for Google origins. - * @hide pending API council review */ class GoogleLocationSettingManager { // The observer used to listen to the system setting. diff --git a/core/java/android/webkit/MockGeolocation.java b/core/java/android/webkit/MockGeolocation.java index 028cb196a9972..fbda4924da0e8 100644 --- a/core/java/android/webkit/MockGeolocation.java +++ b/core/java/android/webkit/MockGeolocation.java @@ -19,7 +19,7 @@ package android.webkit; /** * This class is simply a container for the methods used to configure WebKit's * mock Geolocation service for use in LayoutTests. - * @hide Pending API council review. + * @hide */ public final class MockGeolocation { diff --git a/core/java/android/webkit/ValueCallback.java b/core/java/android/webkit/ValueCallback.java index d8c5cdce23725..1a167e82e7acb 100644 --- a/core/java/android/webkit/ValueCallback.java +++ b/core/java/android/webkit/ValueCallback.java @@ -18,12 +18,10 @@ package android.webkit; /** * A callback interface used to returns values asynchronously - * - * @hide pending council approval */ -public interface ValueCallback { - /** - * Invoked when we have the result - */ - public void onReceiveValue(T value); +public interface ValueCallback { + /** + * Invoked when we have the result + */ + public void onReceiveValue(T value); }; diff --git a/core/java/android/webkit/WebChromeClient.java b/core/java/android/webkit/WebChromeClient.java index 7f5b8629f16f6..92676aac8c766 100644 --- a/core/java/android/webkit/WebChromeClient.java +++ b/core/java/android/webkit/WebChromeClient.java @@ -49,7 +49,6 @@ public class WebChromeClient { * @param view The WebView that initiated the callback. * @param url The icon url. * @param precomposed True if the url is for a precomposed touch icon. - * @hide pending council approval */ public void onReceivedTouchIconUrl(WebView view, String url, boolean precomposed) {} @@ -57,8 +56,6 @@ public class WebChromeClient { /** * A callback interface used by the host application to notify * the current page that its custom view has been dismissed. - * - * @hide pending council approval */ public interface CustomViewCallback { /** @@ -74,16 +71,12 @@ public class WebChromeClient { * @param view is the View object to be shown. * @param callback is the callback to be invoked if and when the view * is dismissed. - * - * @hide pending council approval */ public void onShowCustomView(View view, CustomViewCallback callback) {}; /** * Notify the host application that the current page would * like to hide its custom view. - * - * @hide pending council approval */ public void onHideCustomView() {} @@ -230,7 +223,6 @@ public class WebChromeClient { * @param quotaUpdater A callback to inform the WebCore thread that a new * app cache size is available. This callback must always be executed at * some point to ensure that the sleeping WebCore thread is woken up. - * @hide pending API council approval. */ public void onReachedMaxAppCacheSize(long spaceNeeded, long totalUsedQuota, WebStorage.QuotaUpdater quotaUpdater) { @@ -258,7 +250,6 @@ public class WebChromeClient { * will continue to occur if the script does not finish at the next check * point. * @return boolean Whether the JavaScript execution should be interrupted. - * @hide pending API Council approval */ public boolean onJsTimeout() { return true; @@ -270,7 +261,6 @@ public class WebChromeClient { * @param message The error message to report. * @param lineNumber The line number of the error. * @param sourceID The name of the source file that caused the error. - * @hide pending API council. */ public void addMessageToConsole(String message, int lineNumber, String sourceID) {} @@ -279,7 +269,6 @@ public class WebChromeClient { * This icon will be used if the Web page did not specify a poster attribute. * * @return Bitmap The icon or null if no such icon is available. - * @hide pending API Council approval */ public Bitmap getDefaultVideoPoster() { return null; @@ -290,14 +279,12 @@ public class WebChromeClient { * a