Merge "Fix alpha animations in ViewPropAnimRT" (07a9e2cb) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewPropertyAnimator.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -52,7 +52,7 @@ public class ViewPropertyAnimator {
		* The View whose properties are being animated by this class. This is set at
		* construction time.
		*/
		private final View mView;
		final View mView;

		/**
		* The duration of the underlying Animator object. By default, we don't set the duration

core/java/android/view/ViewPropertyAnimatorRT.java

+11 −18

Original line number	Diff line number	Diff line
		@@ -72,12 +72,22 @@ class ViewPropertyAnimatorRT {
		NameValuesHolder holder = parent.mPendingAnimations.get(i);
		int property = RenderNodeAnimator.mapViewPropertyToRenderProperty(holder.mNameConstant);

		RenderNodeAnimator animator = new RenderNodeAnimator(property, holder.mFromValue + holder.mDeltaValue);
		final float finalValue = holder.mFromValue + holder.mDeltaValue;
		RenderNodeAnimator animator = new RenderNodeAnimator(property, finalValue);
		animator.setStartDelay(startDelay);
		animator.setDuration(duration);
		animator.setInterpolator(interpolator);
		animator.setTarget(mView);
		animator.start();

		// Alpha is a special snowflake that has the canonical value stored
		// in mTransformationInfo instead of in RenderNode, so we need to update
		// it with the final value here.
		if (property == RenderNodeAnimator.ALPHA) {
		// Don't need null check because ViewPropertyAnimator's
		// ctor calls ensureTransformationInfo()
		parent.mView.mTransformationInfo.mAlpha = finalValue;
		}
		}

		parent.mPendingAnimations.clear();
		@@ -108,27 +118,10 @@ class ViewPropertyAnimatorRT {
		if (parent.hasActions()) {
		return false;
		}
		if (hasAlphaAnimation(parent)) {
		// TODO: Alpha does too much weird stuff currently to safely RT-accelerate
		// see View:getFinalAlpha() and friends, which need to be fixed to
		// work with RT animators
		return false;
		}
		// Here goes nothing...
		return true;
		}

		private boolean hasAlphaAnimation(ViewPropertyAnimator parent) {
		int size = parent.mPendingAnimations.size();
		for (int i = 0; i < size; i++) {
		NameValuesHolder holder = parent.mPendingAnimations.get(i);
		if (holder.mNameConstant == ViewPropertyAnimator.ALPHA) {
		return true;
		}
		}
		return false;
		}

		private void cancelAnimators(ArrayList<NameValuesHolder> mPendingAnimations) {
		int size = mPendingAnimations.size();
		for (int i = 0; i < size; i++) {