summaryrefslogtreecommitdiff
path: root/libs/hwui/Animator.h
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2016-08-06 01:15:48 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-08-06 01:15:48 +0000
commitbc4cefa33186766815c77dd6d278576cff6e3ab3 (patch)
treeefef33a189d941189a5fd3c9b8c2ff32dae8f61a /libs/hwui/Animator.h
parent9b27ac401afb228bad8541644c6cc9b1d2745fc8 (diff)
parent6725d581eb3c13591a4ff276413dbfa0fc13e739 (diff)
Remove animation value change from push staging
am: 6725d581eb Change-Id: I53988f1d269c9691a098693a978e1d6e0b275cd6
Diffstat (limited to 'libs/hwui/Animator.h')
-rw-r--r--libs/hwui/Animator.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/libs/hwui/Animator.h b/libs/hwui/Animator.h
index 259f21b9934f..72bac6c2a515 100644
--- a/libs/hwui/Animator.h
+++ b/libs/hwui/Animator.h
@@ -165,6 +165,17 @@ private:
Cancel,
End
};
+
+ // Defines different actions upon finish.
+ enum class Action {
+ // For animations that got canceled or finished normally. no more action needs to be done.
+ None,
+ // For animations that get reset, the reset will happen in the next animation pulse.
+ Reset,
+ // For animations being ended, in the next animation pulse the animation will skip to end.
+ End
+ };
+
inline void checkMutable();
virtual void transitionToRunning(AnimationContext& context);
void doSetStartValue(float value);
@@ -172,7 +183,7 @@ private:
void resolveStagingRequest(Request request);
std::vector<Request> mStagingRequests;
-
+ Action mPendingActionUponFinish = Action::None;
};
class RenderPropertyAnimator : public BaseRenderNodeAnimator {