diff options
| author | Kristian Monsen <kristianm@google.com> | 2012-09-17 11:29:20 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-17 11:29:20 -0700 |
| commit | 7f52de24d65b3c4f3199f0fd88e1e26376d6c9d1 (patch) | |
| tree | cae04dccd27ab81ac6dea19a9a23e30e64d17691 /core/java/android/webkit/WebSettings.java | |
| parent | bb12a413db1692b326ad676aadb64cd9df07c775 (diff) | |
| parent | 7b1be537546481c6687efd03c3c709b266502abf (diff) | |
| download | frameworks_base-7f52de24d65b3c4f3199f0fd88e1e26376d6c9d1.zip frameworks_base-7f52de24d65b3c4f3199f0fd88e1e26376d6c9d1.tar.gz frameworks_base-7f52de24d65b3c4f3199f0fd88e1e26376d6c9d1.tar.bz2 | |
am 7b1be537: am 4cb846b8: Merge "Hiding some of the deprecated android.webkit API\'s" into jb-mr1-dev
* commit '7b1be537546481c6687efd03c3c709b266502abf':
Hiding some of the deprecated android.webkit API's
Diffstat (limited to 'core/java/android/webkit/WebSettings.java')
| -rw-r--r-- | core/java/android/webkit/WebSettings.java | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java index ed32bd2..fda8dbb 100644 --- a/core/java/android/webkit/WebSettings.java +++ b/core/java/android/webkit/WebSettings.java @@ -172,6 +172,7 @@ public abstract class WebSettings { * is false. * * @deprecated This method is now obsolete. + * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ @Deprecated public void setNavDump(boolean enabled) { @@ -184,6 +185,7 @@ public abstract class WebSettings { * @return whether dumping the navigation cache is enabled * @see #setNavDump * @deprecated This method is now obsolete. + * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ @Deprecated public boolean getNavDump() { @@ -385,6 +387,7 @@ public abstract class WebSettings { * * @see #setUseWebViewBackgroundForOverscrollBackground * @deprecated This method is now obsolete. + * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ @Deprecated public boolean getUseWebViewBackgroundForOverscrollBackground() { @@ -526,6 +529,7 @@ public abstract class WebSettings { * it now has no effect. * * @deprecated This setting now has no effect. + * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ @Deprecated public synchronized void setUseDoubleTree(boolean use) { @@ -537,6 +541,7 @@ public abstract class WebSettings { * it now has no effect. * * @deprecated This setting now has no effect. + * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ @Deprecated public synchronized boolean getUseDoubleTree() { @@ -555,6 +560,7 @@ public abstract class WebSettings { * * @param ua the integer code for the user-agent string * @deprecated Please use {@link #setUserAgentString} instead. + * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ @Deprecated public synchronized void setUserAgent(int ua) { @@ -573,6 +579,7 @@ public abstract class WebSettings { * @return the integer code for the user-agent string * @see #setUserAgent * @deprecated Please use {@link #getUserAgentString} instead. + * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1} */ @Deprecated public synchronized int getUserAgent() { @@ -1278,8 +1285,7 @@ public abstract class WebSettings { /** * Returns the default User-Agent used by a WebView. * An instance of WebView could use a different User-Agent if a call - * is made to {@link WebSettings#setUserAgent(int)} or - * {@link WebSettings#setUserAgentString(String)}. + * is made to {@link WebSettings#setUserAgentString(String)}. * * @param context a Context object used to access application assets */ |