summaryrefslogtreecommitdiff
path: root/core/java/android
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2013-04-18 20:39:48 -0700
committerYing Wang <wangying@google.com>2013-04-18 20:39:48 -0700
commit4e0eb22fdf56b8f3fd1bff09c4064b35b80751c1 (patch)
tree135dd9f829ce4fa6c6ee4978c9e0c1fec2a6e52d /core/java/android
parent8adf5d2b0d3c59e085837159173c3228061ce3e7 (diff)
Fix doc build.
Change-Id: Ibf0d998721a2851c31529d5b44bf86b1b3df5791
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/app/Activity.java4
-rw-r--r--core/java/android/view/WindowManager.java4
2 files changed, 3 insertions, 5 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index a26bdbcbfed0..6b5df7f74c70 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -1353,8 +1353,8 @@ public class Activity extends ContextThemeWrapper
* of the assist Intent. The default implementation does nothing.
*
* <p>This function will be called after any global assist callbacks that had
- * been registered with {@link Application#registerOnProvideAssistData
- * Application.registerOnProvideAssistData}.
+ * been registered with {@link Application#registerOnProvideAssistDataListener
+ * Application.registerOnProvideAssistDataListener}.
*/
public void onProvideAssistData(Bundle data) {
}
diff --git a/core/java/android/view/WindowManager.java b/core/java/android/view/WindowManager.java
index 48630a4156ed..0212482f8961 100644
--- a/core/java/android/view/WindowManager.java
+++ b/core/java/android/view/WindowManager.java
@@ -795,9 +795,7 @@ public interface WindowManager extends ViewManager {
* <p>This flag can be controlled in your theme through the
* {@link android.R.attr#windowOverscan} attribute; this attribute
* is automatically set for you in the standard overscan themes
- * such as {@link android.R.style#Theme_NoTitleBar_Overscan},
- * {@link android.R.style#Theme_Black_NoTitleBar_Overscan},
- * {@link android.R.style#Theme_Light_NoTitleBar_Overscan},
+ * such as
* {@link android.R.style#Theme_Holo_NoActionBar_Overscan},
* {@link android.R.style#Theme_Holo_Light_NoActionBar_Overscan},
* {@link android.R.style#Theme_DeviceDefault_NoActionBar_Overscan}, and