diff options
author | Doris Liu <tianliu@google.com> | 2016-02-04 20:04:10 +0000 |
---|---|---|
committer | Doris Liu <tianliu@google.com> | 2016-02-04 20:59:00 +0000 |
commit | 5a11e8d0ba21624025b89ac63bbd18befa55be0e (patch) | |
tree | 5166f73696e1ea08cde286757403fa944f40efc0 /libs/hwui/PropertyValuesAnimatorSet.h | |
parent | 95085d154b1ea6b4db3ae14d39a1c8c8a6560f78 (diff) |
Revert "VectorDrawable native rendering - Step 4 of MANY"
b/26949340 and b/26975469, b/26975079 as well
This reverts commit f276acd98457bcaabc9e79a17a736b3b484f005e.
Change-Id: I4b55177daf0d289bc03604c71fd4bf579f65073a
Diffstat (limited to 'libs/hwui/PropertyValuesAnimatorSet.h')
-rw-r--r-- | libs/hwui/PropertyValuesAnimatorSet.h | 85 |
1 files changed, 0 insertions, 85 deletions
diff --git a/libs/hwui/PropertyValuesAnimatorSet.h b/libs/hwui/PropertyValuesAnimatorSet.h deleted file mode 100644 index 4c7ce528bb20..000000000000 --- a/libs/hwui/PropertyValuesAnimatorSet.h +++ /dev/null @@ -1,85 +0,0 @@ -/* - * Copyright (C) 2016 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. - */ - -#pragma once - -#include "Animator.h" -#include "PropertyValuesHolder.h" -#include "Interpolator.h" - -namespace android { -namespace uirenderer { - -class PropertyAnimator { -public: - PropertyAnimator(PropertyValuesHolder* holder, Interpolator* interpolator, nsecs_t startDelay, - nsecs_t duration, int repeatCount); - void setCurrentPlayTime(nsecs_t playTime); - nsecs_t getTotalDuration() { - return mTotalDuration; - } - void setFraction(float fraction); - -private: - std::unique_ptr<PropertyValuesHolder> mPropertyValuesHolder; - std::unique_ptr<Interpolator> mInterpolator; - nsecs_t mStartDelay; - nsecs_t mDuration; - uint32_t mRepeatCount; - nsecs_t mTotalDuration; - float mLatestFraction = 0.0f; -}; - -class ANDROID_API PropertyValuesAnimatorSet : public BaseRenderNodeAnimator { -public: - friend class PropertyAnimatorSetListener; - PropertyValuesAnimatorSet(); - - void start(AnimationListener* listener); - void reverse(AnimationListener* listener); - void reset(); - - void addPropertyAnimator(PropertyValuesHolder* propertyValuesHolder, - Interpolator* interpolators, int64_t startDelays, - nsecs_t durations, int repeatCount); - virtual uint32_t dirtyMask(); - -protected: - virtual float getValue(RenderNode* target) const override; - virtual void setValue(RenderNode* target, float value) override; - virtual void onPlayTimeChanged(nsecs_t playTime) override; - -private: - void init(); - void onFinished(BaseRenderNodeAnimator* animator); - // Listener set from outside - sp<AnimationListener> mOneShotListener; - std::vector< std::unique_ptr<PropertyAnimator> > mAnimators; - float mLastFraction = 0.0f; - bool mInitialized = false; -}; - -class PropertyAnimatorSetListener : public AnimationListener { -public: - PropertyAnimatorSetListener(PropertyValuesAnimatorSet* set) : mSet(set) {} - virtual void onAnimationFinished(BaseRenderNodeAnimator* animator) override; - -private: - PropertyValuesAnimatorSet* mSet; -}; - -} // namespace uirenderer -} // namespace android |