summaryrefslogtreecommitdiff
path: root/libs/hwui/Animator.h
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2016-02-04 20:04:10 +0000
committerDoris Liu <tianliu@google.com>2016-02-04 20:59:00 +0000
commit5a11e8d0ba21624025b89ac63bbd18befa55be0e (patch)
tree5166f73696e1ea08cde286757403fa944f40efc0 /libs/hwui/Animator.h
parent95085d154b1ea6b4db3ae14d39a1c8c8a6560f78 (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/Animator.h')
-rw-r--r--libs/hwui/Animator.h26
1 files changed, 1 insertions, 25 deletions
diff --git a/libs/hwui/Animator.h b/libs/hwui/Animator.h
index 2c9c9c3fe0f9..aea95bfc1c0e 100644
--- a/libs/hwui/Animator.h
+++ b/libs/hwui/Animator.h
@@ -59,13 +59,7 @@ public:
mMayRunAsync = mayRunAsync;
}
bool mayRunAsync() { return mMayRunAsync; }
- ANDROID_API void start() {
- if (mStagingPlayState == PlayState::NotStarted) {
- mStagingPlayState = PlayState::Running;
- } else {
- mStagingPlayState = PlayState::Restarted;
- }
- onStagingPlayStateChanged(); }
+ ANDROID_API void start() { mStagingPlayState = PlayState::Running; onStagingPlayStateChanged(); }
ANDROID_API void end() { mStagingPlayState = PlayState::Finished; onStagingPlayStateChanged(); }
void attach(RenderNode* target);
@@ -83,27 +77,10 @@ public:
void forceEndNow(AnimationContext& context);
protected:
- // PlayState is used by mStagingPlayState and mPlayState to track the state initiated from UI
- // thread and Render Thread animation state, respectively.
- // From the UI thread, mStagingPlayState transition looks like
- // NotStarted -> Running -> Finished
- // ^ |
- // | |
- // Restarted <------
- // Note: For mStagingState, the Finished state (optional) is only set when the animation is
- // terminated by user.
- //
- // On Render Thread, mPlayState transition:
- // NotStart -> Running -> Finished
- // ^ |
- // | |
- // -------------
-
enum class PlayState {
NotStarted,
Running,
Finished,
- Restarted,
};
BaseRenderNodeAnimator(float finalValue);
@@ -116,7 +93,6 @@ protected:
void callOnFinishedListener(AnimationContext& context);
virtual void onStagingPlayStateChanged() {}
- virtual void onPlayTimeChanged(nsecs_t playTime) {}
RenderNode* mTarget;