Merge "Remove dead code" (9e1c3b78) · Commits · e / os / android_frameworks_base

config/hiddenapi-light-greylist.txt

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6049,7 +6049,6 @@ Landroid/view/ViewHierarchyEncoder;->addProperty(Ljava/lang/String;Ljava/lang/St
	Landroid/view/ViewHierarchyEncoder;->addProperty(Ljava/lang/String;Z)V		Landroid/view/ViewHierarchyEncoder;->addProperty(Ljava/lang/String;Z)V
	Landroid/view/ViewOverlay;->getOverlayView()Landroid/view/ViewGroup;		Landroid/view/ViewOverlay;->getOverlayView()Landroid/view/ViewGroup;
	Landroid/view/ViewOverlay;->isEmpty()Z		Landroid/view/ViewOverlay;->isEmpty()Z
	Landroid/view/ViewPropertyAnimator;->mRTBackend:Landroid/view/ViewPropertyAnimatorRT;
	Landroid/view/ViewRootImpl$CalledFromWrongThreadException;-><init>(Ljava/lang/String;)V		Landroid/view/ViewRootImpl$CalledFromWrongThreadException;-><init>(Ljava/lang/String;)V
	Landroid/view/ViewRootImpl;->addConfigCallback(Landroid/view/ViewRootImpl$ConfigChangedCallback;)V		Landroid/view/ViewRootImpl;->addConfigCallback(Landroid/view/ViewRootImpl$ConfigChangedCallback;)V
	Landroid/view/ViewRootImpl;->cancelInvalidate(Landroid/view/View;)V		Landroid/view/ViewRootImpl;->cancelInvalidate(Landroid/view/View;)V

core/java/android/view/ViewPropertyAnimator.java

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -108,11 +108,6 @@ public class ViewPropertyAnimator {
	*/		*/
	private ValueAnimator mTempValueAnimator;		private ValueAnimator mTempValueAnimator;

	/**
	* A RenderThread-driven backend that may intercept startAnimation
	*/
	private ViewPropertyAnimatorRT mRTBackend;

	/**		/**
	* This listener is the mechanism by which the underlying Animator causes changes to the		* This listener is the mechanism by which the underlying Animator causes changes to the
	* properties currently being animated, as well as the cleanup after an animation is		* properties currently being animated, as well as the cleanup after an animation is
	@@ -434,9 +429,6 @@ public class ViewPropertyAnimator {
	mPendingOnStartAction = null;		mPendingOnStartAction = null;
	mPendingOnEndAction = null;		mPendingOnEndAction = null;
	mView.removeCallbacks(mAnimationStarter);		mView.removeCallbacks(mAnimationStarter);
	if (mRTBackend != null) {
	mRTBackend.cancelAll();
	}
	}		}

	/**		/**
	@@ -859,9 +851,6 @@ public class ViewPropertyAnimator {
	* value accordingly.		* value accordingly.
	*/		*/
	private void startAnimation() {		private void startAnimation() {
	if (mRTBackend != null && mRTBackend.startAnimation(this)) {
	return;
	}
	mView.setHasTransientState(true);		mView.setHasTransientState(true);
	ValueAnimator animator = ValueAnimator.ofFloat(1.0f);		ValueAnimator animator = ValueAnimator.ofFloat(1.0f);
	ArrayList<NameValuesHolder> nameValueList =		ArrayList<NameValuesHolder> nameValueList =

core/java/android/view/ViewPropertyAnimatorRT.java

deleted100644 → 0

+0 −138

Original line number	Original line	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.view;

	import android.animation.TimeInterpolator;
	import android.view.ViewPropertyAnimator.NameValuesHolder;
	import android.view.animation.Interpolator;
	import android.view.animation.LinearInterpolator;

	import com.android.internal.view.animation.FallbackLUTInterpolator;

	import java.util.ArrayList;


	/**
	* This is a RenderThread driven backend for ViewPropertyAnimator.
	*/
	class ViewPropertyAnimatorRT {

	private static final Interpolator sLinearInterpolator = new LinearInterpolator();

	private final View mView;

	private RenderNodeAnimator mAnimators[] = new RenderNodeAnimator[RenderNodeAnimator.LAST_VALUE + 1];

	ViewPropertyAnimatorRT(View view) {
	mView = view;
	}

	/**
	* @return true if ViewPropertyAnimatorRT handled the animation,
	* false if ViewPropertyAnimator needs to handle it
	*/
	public boolean startAnimation(ViewPropertyAnimator parent) {
	cancelAnimators(parent.mPendingAnimations);
	if (!canHandleAnimator(parent)) {
	return false;
	}
	doStartAnimation(parent);
	return true;
	}

	public void cancelAll() {
	for (int i = 0; i < mAnimators.length; i++) {
	if (mAnimators[i] != null) {
	mAnimators[i].cancel();
	mAnimators[i] = null;
	}
	}
	}

	private void doStartAnimation(ViewPropertyAnimator parent) {
	int size = parent.mPendingAnimations.size();

	long startDelay = parent.getStartDelay();
	long duration = parent.getDuration();
	TimeInterpolator interpolator = parent.getInterpolator();
	if (interpolator == null) {
	// Documented to be LinearInterpolator in ValueAnimator.setInterpolator
	interpolator = sLinearInterpolator;
	}
	if (!RenderNodeAnimator.isNativeInterpolator(interpolator)) {
	interpolator = new FallbackLUTInterpolator(interpolator, duration);
	}
	for (int i = 0; i < size; i++) {
	NameValuesHolder holder = parent.mPendingAnimations.get(i);
	int property = RenderNodeAnimator.mapViewPropertyToRenderProperty(holder.mNameConstant);

	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();

	mAnimators[property] = animator;
	}

	parent.mPendingAnimations.clear();
	}

	private boolean canHandleAnimator(ViewPropertyAnimator parent) {
	// TODO: Can we eliminate this entirely?
	// If RenderNode.animatorProperties() can be toggled to point at staging
	// instead then RNA can be used as the animators for software as well
	// as the updateListener fallback paths. If this can be toggled
	// at the top level somehow, combined with requiresUiRedraw, we could
	// ensure that RT does not self-animate, allowing for safe driving of
	// the animators from the UI thread using the same mechanisms
	// ViewPropertyAnimator does, just with everything sitting on a single
	// animator subsystem instead of multiple.

	if (parent.getUpdateListener() != null) {
	return false;
	}
	if (parent.getListener() != null) {
	// TODO support
	return false;
	}
	if (!mView.isHardwareAccelerated()) {
	// TODO handle this maybe?
	return false;
	}
	if (parent.hasActions()) {
	return false;
	}
	// Here goes nothing...
	return true;
	}

	private void cancelAnimators(ArrayList<NameValuesHolder> mPendingAnimations) {
	int size = mPendingAnimations.size();
	for (int i = 0; i < size; i++) {
	NameValuesHolder holder = mPendingAnimations.get(i);
	int property = RenderNodeAnimator.mapViewPropertyToRenderProperty(holder.mNameConstant);
	if (mAnimators[property] != null) {
	mAnimators[property].cancel();
	mAnimators[property] = null;
	}
	}
	}

	}