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/RenderNode.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/RenderNode.h')
-rw-r--r-- | libs/hwui/RenderNode.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libs/hwui/RenderNode.h b/libs/hwui/RenderNode.h index f248de54acba..e0376450178f 100644 --- a/libs/hwui/RenderNode.h +++ b/libs/hwui/RenderNode.h @@ -187,6 +187,12 @@ public: // UI thread only! ANDROID_API void addAnimator(const sp<BaseRenderNodeAnimator>& animator); + void removeAnimator(const sp<BaseRenderNodeAnimator>& animator); + + // This can only happen during pushStaging() + void onAnimatorTargetChanged(BaseRenderNodeAnimator* animator) { + mAnimatorManager.onAnimatorTargetChanged(animator); + } AnimatorManager& animators() { return mAnimatorManager; } |