diff options
author | John Reck <jreck@google.com> | 2017-11-03 10:12:19 -0700 |
---|---|---|
committer | John Reck <jreck@google.com> | 2017-11-03 10:57:44 -0700 |
commit | 1bcacfdcab0eaa0cee92bd7f5a1b5e271dd68e52 (patch) | |
tree | 4a1366cf2d1cf50b5ec4ed1a8cf0f437053cd0d7 /libs/hwui/PropertyValuesAnimatorSet.h | |
parent | 30ec71c0fe194a551d2e4abaff2159e0730488e0 (diff) |
Format the world (or just HWUI)
Test: No code changes, just ran through clang-format
Change-Id: Id23aa4ec7eebc0446fe3a30260f33e7fd455bb8c
Diffstat (limited to 'libs/hwui/PropertyValuesAnimatorSet.h')
-rw-r--r-- | libs/hwui/PropertyValuesAnimatorSet.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/libs/hwui/PropertyValuesAnimatorSet.h b/libs/hwui/PropertyValuesAnimatorSet.h index a5d9e869196f..e4214b22d1cc 100644 --- a/libs/hwui/PropertyValuesAnimatorSet.h +++ b/libs/hwui/PropertyValuesAnimatorSet.h @@ -17,8 +17,8 @@ #pragma once #include "Animator.h" -#include "PropertyValuesHolder.h" #include "Interpolator.h" +#include "PropertyValuesHolder.h" namespace android { namespace uirenderer { @@ -26,11 +26,9 @@ namespace uirenderer { class PropertyAnimator { public: PropertyAnimator(PropertyValuesHolder* holder, Interpolator* interpolator, nsecs_t startDelay, - nsecs_t duration, int repeatCount, RepeatMode repeatMode); + nsecs_t duration, int repeatCount, RepeatMode repeatMode); void setCurrentPlayTime(nsecs_t playTime); - nsecs_t getTotalDuration() { - return mTotalDuration; - } + nsecs_t getTotalDuration() { return mTotalDuration; } // fraction range: [0, 1], iteration range [0, repeatCount] void setFraction(float fraction, long iteration); @@ -57,8 +55,8 @@ public: virtual void end() override; void addPropertyAnimator(PropertyValuesHolder* propertyValuesHolder, - Interpolator* interpolators, int64_t startDelays, - nsecs_t durations, int repeatCount, RepeatMode repeatMode); + Interpolator* interpolators, int64_t startDelays, nsecs_t durations, + int repeatCount, RepeatMode repeatMode); virtual uint32_t dirtyMask(); bool isInfinite() { return mIsInfinite; } void setVectorDrawable(VectorDrawableRoot* vd) { mVectorDrawable = vd; } @@ -77,7 +75,7 @@ private: void onFinished(BaseRenderNodeAnimator* animator); // Listener set from outside sp<AnimationListener> mOneShotListener; - std::vector< std::unique_ptr<PropertyAnimator> > mAnimators; + std::vector<std::unique_ptr<PropertyAnimator> > mAnimators; float mLastFraction = 0.0f; bool mInitialized = false; sp<VectorDrawableRoot> mVectorDrawable; @@ -96,5 +94,5 @@ private: PropertyValuesAnimatorSet* mSet; }; -} // namespace uirenderer -} // namespace android +} // namespace uirenderer +} // namespace android |