diff options
| author | Doris Liu <tianliu@google.com> | 2016-02-19 21:46:06 +0000 |
|---|---|---|
| committer | Doris Liu <tianliu@google.com> | 2016-02-19 13:52:41 -0800 |
| commit | 8b083206aef627b6445a8c6be8bf5bb1d778a7f8 (patch) | |
| tree | 3c4e5e18fbd6f1f6dd3400567b86e9e793fd2665 /libs/hwui/Animator.h | |
| parent | c4bb185d41cfb960ed9a3178a4f8974c351abdb0 (diff) | |
Revert "Revert "Check RenderNode's owning view before attaching animators""
This reverts commit eb40178af3b7c8d925eaf6c1aa0bef739c8ea47e.
Change-Id: I6838ecb35b50847746ee66ac204f14eb5f579b91
Diffstat (limited to 'libs/hwui/Animator.h')
| -rw-r--r-- | libs/hwui/Animator.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/hwui/Animator.h b/libs/hwui/Animator.h index fcbc11b0306c..fdae0f32d4e6 100644 --- a/libs/hwui/Animator.h +++ b/libs/hwui/Animator.h @@ -85,6 +85,7 @@ public: void forceEndNow(AnimationContext& context); RenderNode* target() { return mTarget; } + RenderNode* stagingTarget() { return mStagingTarget; } protected: // PlayState is used by mStagingPlayState and mPlayState to track the state initiated from UI @@ -123,8 +124,10 @@ protected: virtual void onStagingPlayStateChanged() {} virtual void onPlayTimeChanged(nsecs_t playTime) {} + virtual void onPushStaging() {} RenderNode* mTarget; + RenderNode* mStagingTarget; float mFinalValue; float mDeltaValue; @@ -188,6 +191,7 @@ protected: virtual void setValue(RenderNode* target, float value) override; virtual void onAttached() override; virtual void onStagingPlayStateChanged() override; + virtual void onPushStaging() override; private: typedef bool (RenderProperties::*SetFloatProperty)(float value); @@ -197,6 +201,8 @@ private: const PropertyAccessors* mPropertyAccess; static const PropertyAccessors PROPERTY_ACCESSOR_LUT[]; + bool mShouldSyncPropertyFields = false; + bool mShouldUpdateStagingProperties = false; }; class CanvasPropertyPrimitiveAnimator : public BaseRenderNodeAnimator { |