am 7fe86c47: Merge "Fix docs for ViewAnimationUtils.createCircularReveal" into mnc-dev (e61668cb) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewAnimationUtils.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -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.
		*/

+4 −4

Original line number	Diff line number	Diff line
		@@ -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();