diff options
author | Grace Kloba <klobag@google.com> | 2009-10-22 12:17:20 -0700 |
---|---|---|
committer | Grace Kloba <klobag@google.com> | 2009-11-07 10:39:07 -0800 |
commit | 0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65 (patch) | |
tree | c1ceebad37ac22e334c3ce8388f8bb746de0d9f7 /core/java | |
parent | 638d86535264b24b54698fca7e18e68571fe0bad (diff) | |
download | frameworks_base-0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65.zip frameworks_base-0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65.tar.gz frameworks_base-0691ad50ca6b7a2968a0b95e1e9bb7228dd47d65.tar.bz2 |
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.
Diffstat (limited to 'core/java')
-rw-r--r-- | core/java/android/webkit/CacheManager.java | 6 | ||||
-rw-r--r-- | core/java/android/webkit/CallbackProxy.java | 13 | ||||
-rwxr-xr-x | core/java/android/webkit/GeolocationPermissions.java | 6 | ||||
-rwxr-xr-x | core/java/android/webkit/GeolocationService.java | 3 | ||||
-rw-r--r-- | core/java/android/webkit/GoogleLocationSettingManager.java | 1 | ||||
-rw-r--r-- | core/java/android/webkit/MockGeolocation.java | 2 | ||||
-rw-r--r-- | core/java/android/webkit/ValueCallback.java | 12 | ||||
-rw-r--r-- | core/java/android/webkit/WebChromeClient.java | 13 | ||||
-rw-r--r-- | core/java/android/webkit/WebSettings.java | 11 | ||||
-rw-r--r-- | core/java/android/webkit/WebStorage.java | 7 | ||||
-rw-r--r-- | core/java/android/webkit/WebView.java | 1 |
11 files changed, 7 insertions, 68 deletions
diff --git a/core/java/android/webkit/CacheManager.java b/core/java/android/webkit/CacheManager.java index 02e8d6f..75028de 100644 --- a/core/java/android/webkit/CacheManager.java +++ b/core/java/android/webkit/CacheManager.java @@ -109,9 +109,6 @@ public final class CacheManager { return expires; } - /** - * @hide Pending API council approval - */ public String getExpiresString() { return expiresString; } @@ -136,9 +133,6 @@ public final class CacheManager { return encoding; } - /** - * @hide Pending API council approval - */ public String getContentDisposition() { return contentdisposition; } diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java index 8d55247..f760b61 100644 --- a/core/java/android/webkit/CallbackProxy.java +++ b/core/java/android/webkit/CallbackProxy.java @@ -159,8 +159,6 @@ class CallbackProxy extends Handler { /** * Get the WebChromeClient. * @return the current WebChromeClient instance. - * - *@hide pending API council approval. */ public WebChromeClient getWebChromeClient() { return mWebChromeClient; @@ -1237,7 +1235,6 @@ class CallbackProxy extends Handler { * @param quotaUpdater An instance of a class encapsulating a callback * to WebViewCore to run when the decision to allow or deny a bigger * app cache size has been made. - * @hide pending API council approval. */ public void onReachedMaxAppCacheSize(long spaceNeeded, long totalUsedQuota, WebStorage.QuotaUpdater quotaUpdater) { @@ -1261,7 +1258,6 @@ class CallbackProxy extends Handler { * @param origin The origin requesting Geolocation permsissions. * @param callback The callback to call once a permission state has been * obtained. - * @hide pending API council review. */ public void onGeolocationPermissionsShowPrompt(String origin, GeolocationPermissions.Callback callback) { @@ -1281,8 +1277,6 @@ class CallbackProxy extends Handler { /** * Called by WebViewCore to instruct the browser to hide the Geolocation * permissions prompt. - * origin. - * @hide pending API council review. */ public void onGeolocationPermissionsHidePrompt() { if (mWebChromeClient == null) { @@ -1301,7 +1295,6 @@ class CallbackProxy extends Handler { * occurred. * @param sourceID The filename of the source file in which the error * occurred. - * @hide pending API counsel. */ public void addMessageToConsole(String message, int lineNumber, String sourceID) { if (mWebChromeClient == null) { @@ -1315,9 +1308,6 @@ class CallbackProxy extends Handler { sendMessage(msg); } - /** - * @hide pending API council approval - */ public boolean onJsTimeout() { //always interrupt timedout JS by default if (mWebChromeClient == null) { @@ -1337,9 +1327,6 @@ class CallbackProxy extends Handler { return result.getResult(); } - /** - * @hide pending API council approval - */ public void getVisitedHistory(ValueCallback<String[]> callback) { if (mWebChromeClient == null) { return; diff --git a/core/java/android/webkit/GeolocationPermissions.java b/core/java/android/webkit/GeolocationPermissions.java index 483e9e9..64a9d9b 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<Set> 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<Boolean> 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 646f8c5..24306f4 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 508df3b..ecac70a 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 028cb19..fbda492 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 d8c5cdc..1a167e8 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<T> { - /** - * Invoked when we have the result - */ - public void onReceiveValue(T value); +public interface ValueCallback<T> { + /** + * 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 7f5b862..92676aa 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 <video> is loading. * * @return View The progress view. - * @hide pending API Council approval */ public View getVideoLoadingProgressView() { return null; } /** Obtains a list of all visited history items, used for link coloring - * @hide pending API Council approval */ public void getVisitedHistory(ValueCallback<String[]> callback) { } diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index 4fedec9..6f3262a 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -74,7 +74,6 @@ public class WebSettings { * FAR makes 100% looking like in 240dpi * MEDIUM makes 100% looking like in 160dpi * CLOSE makes 100% looking like in 120dpi - * @hide Pending API council approval */ public enum ZoomDensity { FAR(150), // 240dpi @@ -452,7 +451,6 @@ public class WebSettings { /** * Set whether the WebView loads a page with overview mode. - * @hide Pending API council approval */ public void setLoadWithOverviewMode(boolean overview) { mLoadWithOverviewMode = overview; @@ -460,7 +458,6 @@ public class WebSettings { /** * Returns true if this WebView loads page with overview mode - * @hide Pending API council approval */ public boolean getLoadWithOverviewMode() { return mLoadWithOverviewMode; @@ -522,7 +519,6 @@ public class WebSettings { * thread. * @param zoom A ZoomDensity value * @see WebSettings.ZoomDensity - * @hide Pending API council approval */ public void setDefaultZoom(ZoomDensity zoom) { if (mDefaultZoom != zoom) { @@ -536,7 +532,6 @@ public class WebSettings { * thread. * @return A ZoomDensity value * @see WebSettings.ZoomDensity - * @hide Pending API council approval */ public ZoomDensity getDefaultZoom() { return mDefaultZoom; @@ -1016,7 +1011,6 @@ public class WebSettings { /** * Tell the WebView to enable Application Caches API. * @param flag True if the WebView should enable Application Caches. - * @hide pending api council approval */ public synchronized void setAppCacheEnabled(boolean flag) { if (mAppCacheEnabled != flag) { @@ -1031,7 +1025,6 @@ public class WebSettings { * @param appCachePath String path to the directory containing Application * Caches files. The appCache path can be the empty string but should not * be null. Passing null for this parameter will result in a no-op. - * @hide pending api council approval */ public synchronized void setAppCachePath(String appCachePath) { if (appCachePath != null && !appCachePath.equals(mAppCachePath)) { @@ -1043,8 +1036,6 @@ public class WebSettings { /** * Set the maximum size for the Application Caches content. * @param appCacheMaxSize the maximum size in bytes. - * - * @hide pending api council approval */ public synchronized void setAppCacheMaxSize(long appCacheMaxSize) { if (appCacheMaxSize != mAppCacheMaxSize) { @@ -1069,7 +1060,6 @@ public class WebSettings { * Set whether the DOM storage API is enabled. * @param flag boolean True if the WebView should use the DOM storage * API. - * @hide pending API council. */ public synchronized void setDomStorageEnabled(boolean flag) { if (mDomStorageEnabled != flag) { @@ -1081,7 +1071,6 @@ public class WebSettings { /** * Returns true if the DOM Storage API's are enabled. * @return True if the DOM Storage API's are enabled. - * @hide pending API council. */ public synchronized boolean getDomStorageEnabled() { return mDomStorageEnabled; diff --git a/core/java/android/webkit/WebStorage.java b/core/java/android/webkit/WebStorage.java index 0022248..a182287 100644 --- a/core/java/android/webkit/WebStorage.java +++ b/core/java/android/webkit/WebStorage.java @@ -229,7 +229,6 @@ public final class WebStorage { */ /** - * @hide * Returns a list of origins having a database */ public void getOrigins(ValueCallback<Map> callback) { @@ -256,7 +255,6 @@ public final class WebStorage { } /** - * @hide * Returns the use for a given origin */ public void getUsageForOrigin(String origin, ValueCallback<Long> callback) { @@ -280,7 +278,6 @@ public final class WebStorage { } /** - * @hide * Returns the quota for a given origin */ public void getQuotaForOrigin(String origin, ValueCallback<Long> callback) { @@ -304,7 +301,6 @@ public final class WebStorage { } /** - * @hide * Set the quota for a given origin */ public void setQuotaForOrigin(String origin, long quota) { @@ -319,7 +315,6 @@ public final class WebStorage { } /** - * @hide * Delete a given origin */ public void deleteOrigin(String origin) { @@ -334,7 +329,6 @@ public final class WebStorage { } /** - * @hide * Delete all databases */ public void deleteAllData() { @@ -364,7 +358,6 @@ public final class WebStorage { } /** - * @hide * Get the global instance of WebStorage. * @return A single instance of WebStorage. */ diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 06c70ca..142dffb 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2265,7 +2265,6 @@ public class WebView extends AbsoluteLayout /** * Call this to inform the view that memory is low so that it can * free any available memory. - * @hide */ public void freeMemory() { mWebViewCore.sendMessage(EventHub.FREE_MEMORY); |