summaryrefslogtreecommitdiffstats
path: root/core/java/android
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@android.com>2014-03-10 17:08:27 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-10 17:08:27 -0700
commit33282d66155e8d68acea512989ec61cb15fae1ce (patch)
treeebe27363f39dcd2469af96eab00a0885cd043bd6 /core/java/android
parentaaf23a9a653457cccf54293b2ff76196718c7a1a (diff)
parenta41ddccdc67ace7c9363efebbf6e51710928ce12 (diff)
downloadframeworks_base-33282d66155e8d68acea512989ec61cb15fae1ce.zip
frameworks_base-33282d66155e8d68acea512989ec61cb15fae1ce.tar.gz
frameworks_base-33282d66155e8d68acea512989ec61cb15fae1ce.tar.bz2
am a41ddccd: Merge "Fixed typo errors in documentation"
* commit 'a41ddccdc67ace7c9363efebbf6e51710928ce12': Fixed typo errors in documentation
Diffstat (limited to 'core/java/android')
-rw-r--r--core/java/android/content/ContentProvider.java2
-rw-r--r--core/java/android/view/View.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/content/ContentProvider.java b/core/java/android/content/ContentProvider.java
index ddde3fb..44831fc 100644
--- a/core/java/android/content/ContentProvider.java
+++ b/core/java/android/content/ContentProvider.java
@@ -987,7 +987,7 @@ public abstract class ContentProvider implements ComponentCallbacks2 {
* Implement this to handle requests to delete one or more rows.
* The implementation should apply the selection clause when performing
* deletion, allowing the operation to affect multiple rows in a directory.
- * As a courtesy, call {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver) notifyDelete()}
+ * As a courtesy, call {@link ContentResolver#notifyChange(android.net.Uri ,android.database.ContentObserver) notifyChange()}
* after deleting.
* This method can be called from multiple threads, as described in
* <a href="{@docRoot}guide/topics/fundamentals/processes-and-threads.html#Threads">Processes
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 83610c3..bdf4141 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10098,7 +10098,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* by the layout system and should not generally be called otherwise, because the property
* may be changed at any time by the layout.
*
- * @param left The bottom of this view, in pixels.
+ * @param left The left of this view, in pixels.
*/
public final void setLeft(int left) {
if (left != mLeft) {
@@ -10165,7 +10165,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* by the layout system and should not generally be called otherwise, because the property
* may be changed at any time by the layout.
*
- * @param right The bottom of this view, in pixels.
+ * @param right The right of this view, in pixels.
*/
public final void setRight(int right) {
if (right != mRight) {