summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Mount <mount@google.com>2015-07-01 11:07:13 -0700
committerGeorge Mount <mount@google.com>2015-07-01 11:10:58 -0700
commit94882946112e5a5d384fca5f39b2bdf7584cba6f (patch)
tree88ab7b6fb5cfdda21d49357f6998adcf831e7165
parenta10277e3e4c01e08f53b98eac3c98bf94482b106 (diff)
downloadframeworks_base-94882946112e5a5d384fca5f39b2bdf7584cba6f.zip
frameworks_base-94882946112e5a5d384fca5f39b2bdf7584cba6f.tar.gz
frameworks_base-94882946112e5a5d384fca5f39b2bdf7584cba6f.tar.bz2
Fix docs for ViewAnimationUtils.createCircularReveal
Bug 22202425 Change-Id: Ic9b5b8ec88b8ae2ece2312e3bc3d4fd49ffc1f1f
-rw-r--r--core/java/android/view/ViewAnimationUtils.java6
-rw-r--r--docs/html/training/material/animations.jd8
2 files changed, 8 insertions, 6 deletions
diff --git a/core/java/android/view/ViewAnimationUtils.java b/core/java/android/view/ViewAnimationUtils.java
index d44df31..4c75935 100644
--- a/core/java/android/view/ViewAnimationUtils.java
+++ b/core/java/android/view/ViewAnimationUtils.java
@@ -43,8 +43,10 @@ public final class ViewAnimationUtils {
* on thread responsiveness.
*
* @param view The View will be clipped to the animating circle.
- * @param centerX The x coordinate of the center of the animating circle.
- * @param centerY The y coordinate of the center of the animating circle.
+ * @param centerX The x coordinate of the center of the animating circle, relative to
+ * <code>view</code>.
+ * @param centerY The y coordinate of the center of the animating circle, relative to
+ * <code>view</code>.
* @param startRadius The starting radius of the animating circle.
* @param endRadius The ending radius of the animating circle.
*/
diff --git a/docs/html/training/material/animations.jd b/docs/html/training/material/animations.jd
index 86e91a7..6f263db 100644
--- a/docs/html/training/material/animations.jd
+++ b/docs/html/training/material/animations.jd
@@ -81,8 +81,8 @@ reveal or hide a view.</p>
View myView = findViewById(R.id.my_view);
// get the center for the clipping circle
-int cx = (myView.getLeft() + myView.getRight()) / 2;
-int cy = (myView.getTop() + myView.getBottom()) / 2;
+int cx = myView.getWidth() / 2;
+int cy = myView.getHeight() / 2;
// get the final radius for the clipping circle
int finalRadius = Math.max(myView.getWidth(), myView.getHeight());
@@ -103,8 +103,8 @@ anim.start();
final View myView = findViewById(R.id.my_view);
// get the center for the clipping circle
-int cx = (myView.getLeft() + myView.getRight()) / 2;
-int cy = (myView.getTop() + myView.getBottom()) / 2;
+int cx = myView.getWidth() / 2;
+int cy = myView.getHeight() / 2;
// get the initial radius for the clipping circle
int initialRadius = myView.getWidth();