summaryrefslogtreecommitdiff
path: root/core/java
diff options
context:
space:
mode:
authorJonathan Dixon <joth@google.com>2013-02-28 23:37:23 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-02-28 23:37:23 +0000
commit6877006646db987db8148117fcdde313d84a93e7 (patch)
tree00508ac6e1ef9a479ceebfd5d0f0a606506c71ad /core/java
parente70e8becf35696d68410a4f66a51da97b3402d2b (diff)
parent98fac170b14e30104ef3fcff03cf9512e59d1aaf (diff)
Merge "Fix javadoc build" into jb-mr2-dev
Diffstat (limited to 'core/java')
-rw-r--r--core/java/android/webkit/WebIconDatabase.java4
-rw-r--r--core/java/android/webkit/WebSettings.java2
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebIconDatabase.java b/core/java/android/webkit/WebIconDatabase.java
index 787997bd2096..e574593fa918 100644
--- a/core/java/android/webkit/WebIconDatabase.java
+++ b/core/java/android/webkit/WebIconDatabase.java
@@ -25,7 +25,7 @@ import android.graphics.Bitmap;
* and WebView.getIconDatabase() will return a WebIconDatabase object. This
* WebIconDatabase object is a single instance and all methods operate on that
* single object.
- * The main use-case for this class is calling {@link WebIconDatabase#open()}
+ * The main use-case for this class is calling {@link #open}
* to enable favicon functionality on all WebView instances in this process.
*
* @deprecated This class is only required when running on devices
@@ -35,7 +35,7 @@ import android.graphics.Bitmap;
public class WebIconDatabase {
/**
* Interface for receiving icons from the database.
- * @deprecated
+ * @deprecated This interface is obsolete.
*/
@Deprecated
public interface IconListener {
diff --git a/core/java/android/webkit/WebSettings.java b/core/java/android/webkit/WebSettings.java
index a69c8cfd713b..0ab49ac5fbe2 100644
--- a/core/java/android/webkit/WebSettings.java
+++ b/core/java/android/webkit/WebSettings.java
@@ -530,7 +530,7 @@ public abstract class WebSettings {
/**
* Gets whether light touches are enabled.
* @see #setLightTouchEnabled
- * @deprecated
+ * @deprecated This setting is obsolete.
*/
@Deprecated
public boolean getLightTouchEnabled() {