am 1c97a526: Merge "Add RevealAnimator" (093f39c1) · Commits · e / os / android_frameworks_base

core/java/android/animation/RevealAnimator.java

0 → 100644

+141 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2014 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.animation;

		import android.view.View;

		import java.util.ArrayList;

		/**
		* Reveals a View with an animated clipping circle.
		* The clipping is implemented efficiently by talking to a private reveal API on View.
		* This hidden class currently only accessed by the {@link android.view.View}.
		*
		* @hide
		*/
		public class RevealAnimator extends ValueAnimator {
		private final static String LOGTAG = "RevealAnimator";
		private ValueAnimator.AnimatorListener mListener;
		private ValueAnimator.AnimatorUpdateListener mUpdateListener;
		private RevealCircle mReuseRevealCircle = new RevealCircle(0);
		private RevealAnimator(final View clipView, final int x, final int y,
		float startRadius, float endRadius, final boolean inverseClip) {

		setObjectValues(new RevealCircle(startRadius), new RevealCircle(endRadius));
		setEvaluator(new RevealCircleEvaluator(mReuseRevealCircle));

		mUpdateListener = new ValueAnimator.AnimatorUpdateListener() {
		@Override
		public void onAnimationUpdate(ValueAnimator animation) {
		RevealCircle circle = (RevealCircle) animation.getAnimatedValue();
		float radius = circle.getRadius();
		clipView.setRevealClip(true, inverseClip, x, y, radius);
		}
		};
		mListener = new AnimatorListenerAdapter() {
		@Override
		public void onAnimationCancel(Animator animation) {
		clipView.setRevealClip(false, false, 0, 0, 0);
		}

		@Override
		public void onAnimationEnd(Animator animation) {
		clipView.setRevealClip(false, false, 0, 0, 0);
		}
		};
		addUpdateListener(mUpdateListener);
		addListener(mListener);
		}

		public static RevealAnimator ofRevealCircle(View clipView, int x, int y,
		float startRadius, float endRadius, boolean inverseClip) {
		RevealAnimator anim = new RevealAnimator(clipView, x, y,
		startRadius, endRadius, inverseClip);
		return anim;
		}


		/**
		* {@inheritDoc}
		*/
		@Override
		public void removeAllUpdateListeners() {
		super.removeAllUpdateListeners();
		addUpdateListener(mUpdateListener);
		}

		/**
		* {@inheritDoc}
		*/
		@Override
		public void removeAllListeners() {
		super.removeAllListeners();
		addListener(mListener);
		}

		/**
		* {@inheritDoc}
		*/
		@Override
		public ArrayList<AnimatorListener> getListeners() {
		ArrayList<AnimatorListener> allListeners =
		(ArrayList<AnimatorListener>) super.getListeners().clone();
		allListeners.remove(mListener);
		return allListeners;
		}

		private class RevealCircle {
		float mRadius;

		public RevealCircle(float radius) {
		mRadius = radius;
		}

		public void setRadius(float radius) {
		mRadius = radius;
		}

		public float getRadius() {
		return mRadius;
		}
		}

		private class RevealCircleEvaluator implements TypeEvaluator<RevealCircle> {

		private RevealCircle mRevealCircle;

		public RevealCircleEvaluator() {
		}

		public RevealCircleEvaluator(RevealCircle reuseCircle) {
		mRevealCircle = reuseCircle;
		}

		@Override
		public RevealCircle evaluate(float fraction, RevealCircle startValue,
		RevealCircle endValue) {
		float currentRadius = startValue.mRadius
		+ ((endValue.mRadius - startValue.mRadius) * fraction);
		if (mRevealCircle == null) {
		return new RevealCircle(currentRadius);
		} else {
		mRevealCircle.setRadius(currentRadius);
		return mRevealCircle;
		}
		}
		}
		}

core/java/android/view/View.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,8 @@

		package android.view;

		import android.animation.RevealAnimator;
		import android.animation.ValueAnimator;
		import android.annotation.IntDef;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		@@ -10809,6 +10811,18 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}
		}

		/**
		* Returns a ValueAnimator which can be used to run a reveal animation,
		* clipping the content of the view to a circle.
		*
		* TODO: Make this a public API.
		* @hide
		*/
		public final ValueAnimator createRevealAnimator(int x, int y,
		float startRadius, float endRadius, boolean inverseClip) {
		return RevealAnimator.ofRevealCircle(this, x, y, startRadius, endRadius, inverseClip);
		}

		/**
		* Sets the outline of the view, which defines the shape of the shadow it
		* casts, and can used for clipping.
		@@ -10891,6 +10905,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		float x, float y, float radius) {
		if (mDisplayList != null) {
		mDisplayList.setRevealClip(shouldClip, inverseClip, x, y, radius);
		// TODO: Handle this invalidate in a better way, or purely in native.
		invalidate();
		}
		}