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

Commit d9e22ed8 authored by Grace Kloba's avatar Grace Kloba Committed by Android Git Automerger
Browse files

am 0691ad50: Remove "@hide pending API council" in webkit to expose the apis to SDK. 

Merge commit '0691ad50' into eclair-mr2

* commit '0691ad50':
  Remove "@hide pending API council" in webkit to expose
parents 704af39c 0691ad50

api/current.xml

+609 −5
Original line number Diff line number Diff line
@@ -173654,6 +173654,17 @@ 
 visibility="public"

>

</constructor>

<method name="getContentDisposition"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getContentLength"

 return="long"

 abstract="false"
@@ -173698,6 +173709,17 @@ 
 visibility="public"

>

</method>

<method name="getExpiresString"

 return="java.lang.String"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getHttpStatusCode"

 return="int"

 abstract="false"
@@ -173822,6 +173844,23 @@ 
<parameter name="w" type="android.webkit.WebView">

</parameter>

</constructor>

<method name="addMessageToConsole"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="message" type="java.lang.String">

</parameter>

<parameter name="lineNumber" type="int">

</parameter>

<parameter name="sourceID" type="java.lang.String">

</parameter>

</method>

<method name="createWindow"

 return="android.webkit.WebView"

 abstract="false"
@@ -173874,6 +173913,30 @@ 
 visibility="public"

>

</method>

<method name="getVisitedHistory"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.lang.String[]&gt;">

</parameter>

</method>

<method name="getWebChromeClient"

 return="android.webkit.WebChromeClient"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onCloseWindow"

 return="void"

 abstract="false"
@@ -173946,6 +174009,32 @@ 
<parameter name="resend" type="android.os.Message">

</parameter>

</method>

<method name="onGeolocationPermissionsHidePrompt"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onGeolocationPermissionsShowPrompt"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="origin" type="java.lang.String">

</parameter>

<parameter name="callback" type="android.webkit.GeolocationPermissions.Callback">

</parameter>

</method>

<method name="onJsAlert"

 return="void"

 abstract="false"
@@ -174008,6 +174097,17 @@ 
<parameter name="defaultValue" type="java.lang.String">

</parameter>

</method>

<method name="onJsTimeout"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onLoadResource"

 return="void"

 abstract="false"
@@ -174062,6 +174162,23 @@ 
<parameter name="newProgress" type="int">

</parameter>

</method>

<method name="onReachedMaxAppCacheSize"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="spaceNeeded" type="long">

</parameter>

<parameter name="totalUsedQuota" type="long">

</parameter>

<parameter name="quotaUpdater" type="android.webkit.WebStorage.QuotaUpdater">

</parameter>

</method>

<method name="onReceivedError"

 return="void"

 abstract="false"
@@ -174548,6 +174665,82 @@ 
 visibility="public"

>

</constructor>

<method name="allow"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="origin" type="java.lang.String">

</parameter>

</method>

<method name="clear"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="origin" type="java.lang.String">

</parameter>

</method>

<method name="clearAll"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getAllowed"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="origin" type="java.lang.String">

</parameter>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.lang.Boolean&gt;">

</parameter>

</method>

<method name="getInstance"

 return="android.webkit.GeolocationPermissions"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getOrigins"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.util.Set&gt;">

</parameter>

</method>

</class>

<interface name="GeolocationPermissions.Callback"

 abstract="true"
@@ -175545,6 +175738,27 @@ 
>

</method>

</class>

<interface name="ValueCallback"

 abstract="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onReceiveValue"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="value" type="T">

</parameter>

</method>

</interface>

<class name="WebBackForwardList"

 extends="java.lang.Object"

 abstract="false"
@@ -175620,6 +175834,58 @@ 
 visibility="public"

>

</constructor>

<method name="addMessageToConsole"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="message" type="java.lang.String">

</parameter>

<parameter name="lineNumber" type="int">

</parameter>

<parameter name="sourceID" type="java.lang.String">

</parameter>

</method>

<method name="getDefaultVideoPoster"

 return="android.graphics.Bitmap"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getVideoLoadingProgressView"

 return="android.view.View"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getVisitedHistory"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.lang.String[]&gt;">

</parameter>

</method>

<method name="onCloseWindow"

 return="void"

 abstract="false"
@@ -175701,6 +175967,17 @@ 
<parameter name="callback" type="android.webkit.GeolocationPermissions.Callback">

</parameter>

</method>

<method name="onHideCustomView"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="onJsAlert"

 return="boolean"

 abstract="false"
@@ -175779,8 +176056,8 @@ 
<parameter name="result" type="android.webkit.JsPromptResult">

</parameter>

</method>

<method name="onProgressChanged"

 return="void"

<method name="onJsTimeout"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"
@@ -175789,9 +176066,37 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="view" type="android.webkit.WebView">

</parameter>

<parameter name="newProgress" type="int">

</method>

<method name="onProgressChanged"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="view" type="android.webkit.WebView">

</parameter>

<parameter name="newProgress" type="int">

</parameter>

</method>

<method name="onReachedMaxAppCacheSize"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="spaceNeeded" type="long">

</parameter>

<parameter name="totalUsedQuota" type="long">

</parameter>

<parameter name="quotaUpdater" type="android.webkit.WebStorage.QuotaUpdater">

</parameter>

</method>

<method name="onReceivedIcon"
@@ -175824,6 +176129,23 @@ 
<parameter name="title" type="java.lang.String">

</parameter>

</method>

<method name="onReceivedTouchIconUrl"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="view" type="android.webkit.WebView">

</parameter>

<parameter name="url" type="java.lang.String">

</parameter>

<parameter name="precomposed" type="boolean">

</parameter>

</method>

<method name="onRequestFocus"

 return="void"

 abstract="false"
@@ -175837,7 +176159,41 @@ 
<parameter name="view" type="android.webkit.WebView">

</parameter>

</method>

<method name="onShowCustomView"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="view" type="android.view.View">

</parameter>

<parameter name="callback" type="android.webkit.WebChromeClient.CustomViewCallback">

</parameter>

</method>

</class>

<interface name="WebChromeClient.CustomViewCallback"

 abstract="true"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<method name="onCustomViewHidden"

 return="void"

 abstract="true"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</interface>

<class name="WebHistoryItem"

 extends="java.lang.Object"

 abstract="false"
@@ -176141,6 +176497,28 @@ 
 visibility="public"

>

</method>

<method name="getDefaultZoom"

 return="android.webkit.WebSettings.ZoomDensity"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getDomStorageEnabled"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getFantasyFontFamily"

 return="java.lang.String"

 abstract="false"
@@ -176207,6 +176585,17 @@ 
 visibility="public"

>

</method>

<method name="getLoadWithOverviewMode"

 return="boolean"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getLoadsImagesAutomatically"

 return="boolean"

 abstract="false"
@@ -176396,6 +176785,45 @@ 
<parameter name="allow" type="boolean">

</parameter>

</method>

<method name="setAppCacheEnabled"

 return="void"

 abstract="false"

 native="false"

 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="flag" type="boolean">

</parameter>

</method>

<method name="setAppCacheMaxSize"

 return="void"

 abstract="false"

 native="false"

 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="appCacheMaxSize" type="long">

</parameter>

</method>

<method name="setAppCachePath"

 return="void"

 abstract="false"

 native="false"

 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="appCachePath" type="java.lang.String">

</parameter>

</method>

<method name="setBlockNetworkImage"

 return="void"

 abstract="false"
@@ -176513,6 +176941,32 @@ 
<parameter name="encoding" type="java.lang.String">

</parameter>

</method>

<method name="setDefaultZoom"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="zoom" type="android.webkit.WebSettings.ZoomDensity">

</parameter>

</method>

<method name="setDomStorageEnabled"

 return="void"

 abstract="false"

 native="false"

 synchronized="true"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="flag" type="boolean">

</parameter>

</method>

<method name="setFantasyFontFamily"

 return="void"

 abstract="false"
@@ -176617,6 +177071,19 @@ 
<parameter name="enabled" type="boolean">

</parameter>

</method>

<method name="setLoadWithOverviewMode"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="overview" type="boolean">

</parameter>

</method>

<method name="setLoadsImagesAutomatically"

 return="void"

 abstract="false"
@@ -177054,6 +177521,39 @@ 
>

</method>

</class>

<class name="WebSettings.ZoomDensity"

 extends="java.lang.Enum"

 abstract="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

<method name="valueOf"

 return="android.webkit.WebSettings.ZoomDensity"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="name" type="java.lang.String">

</parameter>

</method>

<method name="values"

 return="android.webkit.WebSettings.ZoomDensity[]"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</method>

</class>

<class name="WebStorage"

 extends="java.lang.Object"

 abstract="false"
@@ -177070,6 +177570,99 @@ 
 visibility="public"

>

</constructor>

<method name="deleteAllData"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="deleteOrigin"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="origin" type="java.lang.String">

</parameter>

</method>

<method name="getInstance"

 return="android.webkit.WebStorage"

 abstract="false"

 native="false"

 synchronized="false"

 static="true"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getOrigins"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.util.Map&gt;">

</parameter>

</method>

<method name="getQuotaForOrigin"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="origin" type="java.lang.String">

</parameter>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.lang.Long&gt;">

</parameter>

</method>

<method name="getUsageForOrigin"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="origin" type="java.lang.String">

</parameter>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.lang.Long&gt;">

</parameter>

</method>

<method name="setQuotaForOrigin"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

<parameter name="origin" type="java.lang.String">

</parameter>

<parameter name="quota" type="long">

</parameter>

</method>

</class>

<interface name="WebStorage.QuotaUpdater"

 abstract="true"
@@ -177511,6 +178104,17 @@ 
<parameter name="vy" type="int">

</parameter>

</method>

<method name="freeMemory"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"

 static="false"

 final="false"

 deprecated="not deprecated"

 visibility="public"

>

</method>

<method name="getCertificate"

 return="android.net.http.SslCertificate"

 abstract="false"

core/java/android/webkit/CacheManager.java

+0 −6
Original line number Diff line number Diff line
@@ -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;

        }

core/java/android/webkit/CallbackProxy.java

+0 −13
Original line number Diff line number Diff line
@@ -170,8 +170,6 @@ class CallbackProxy extends Handler { 
    /**

     * Get the WebChromeClient.

     * @return the current WebChromeClient instance.

     *

     *@hide pending API council approval.

     */

    public WebChromeClient getWebChromeClient() {

       return mWebChromeClient;
@@ -1251,7 +1249,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) {
@@ -1275,7 +1272,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) {
@@ -1295,8 +1291,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) {
@@ -1315,7 +1309,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) {
@@ -1329,9 +1322,6 @@ class CallbackProxy extends Handler { 
        sendMessage(msg);

    }



    /**

     * @hide pending API council approval

     */

    public boolean onJsTimeout() {

        //always interrupt timedout JS by default

        if (mWebChromeClient == null) {
@@ -1351,9 +1341,6 @@ class CallbackProxy extends Handler { 
        return result.getResult();

    }



    /**

     * @hide pending API council approval

     */

    public void getVisitedHistory(ValueCallback<String[]> callback) {

        if (mWebChromeClient == null) {

            return;

core/java/android/webkit/GeolocationPermissions.java

+0 −6
Original line number Diff line number Diff line
@@ -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.

core/java/android/webkit/GeolocationService.java

+1 −2
Original line number Diff line number Diff line
@@ -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";