summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorGilles Debunne <debunne@google.com>2010-08-19 17:59:08 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-08-19 17:59:08 -0700
commitd018a0ce72124f668d859b19fe3e73f5637d3c7c (patch)
tree48f1c45f7207fd3af0358e62b4b900ac47e09b6c /graphics
parent70c9ffbc838271f0ea27a4780eb146287de53ef6 (diff)
parentb0d6ba1ec4f71b96cab7d1ff62b846d5cf162c4f (diff)
downloadframeworks_base-d018a0ce72124f668d859b19fe3e73f5637d3c7c.zip
frameworks_base-d018a0ce72124f668d859b19fe3e73f5637d3c7c.tar.gz
frameworks_base-d018a0ce72124f668d859b19fe3e73f5637d3c7c.tar.bz2
Merge "Text selection without trackball." into gingerbread
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/graphics/Rect.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/Rect.java b/graphics/java/android/graphics/Rect.java
index 98ffb8b..7830224 100644
--- a/graphics/java/android/graphics/Rect.java
+++ b/graphics/java/android/graphics/Rect.java
@@ -75,6 +75,7 @@ public final class Rect implements Parcelable {
bottom = r.bottom;
}
+ @Override
public boolean equals(Object obj) {
Rect r = (Rect) obj;
if (r != null) {
@@ -84,6 +85,7 @@ public final class Rect implements Parcelable {
return false;
}
+ @Override
public String toString() {
StringBuilder sb = new StringBuilder(32);
sb.append("Rect("); sb.append(left); sb.append(", ");
@@ -351,7 +353,7 @@ public final class Rect implements Parcelable {
* rectangle, return true and set this rectangle to that intersection,
* otherwise return false and do not change this rectangle. No check is
* performed to see if either rectangle is empty. Note: To just test for
- * intersection, use intersects()
+ * intersection, use {@link #intersects(Rect, Rect)}.
*
* @param left The left side of the rectangle being intersected with this
* rectangle
@@ -445,7 +447,7 @@ public final class Rect implements Parcelable {
/**
* Returns true iff the two specified rectangles intersect. In no event are
* either of the rectangles modified. To record the intersection,
- * use intersect() or setIntersect().
+ * use {@link #intersect(Rect)} or {@link #setIntersect(Rect, Rect)}.
*
* @param a The first rectangle being tested for intersection
* @param b The second rectangle being tested for intersection