diff options
| author | John Reck <jreck@google.com> | 2015-07-24 00:02:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-24 00:02:23 +0000 |
| commit | c5d3dde6c70e7d7e83cad85cfd6720f4017a7498 (patch) | |
| tree | bf85989f3cb91ddff580ddb8f66ff1fb84364ace /libs | |
| parent | 0e0d4ec99f8ee9248f5eee3f4596ecbfc80f10c2 (diff) | |
| parent | 8b1154c487c25388107dc024376435f3b0ae2385 (diff) | |
| download | frameworks_base-c5d3dde6c70e7d7e83cad85cfd6720f4017a7498.zip frameworks_base-c5d3dde6c70e7d7e83cad85cfd6720f4017a7498.tar.gz frameworks_base-c5d3dde6c70e7d7e83cad85cfd6720f4017a7498.tar.bz2 | |
am 8b1154c4: Merge "Move updateMatrix() call to animateCommon" into mnc-dev
* commit '8b1154c487c25388107dc024376435f3b0ae2385':
Move updateMatrix() call to animateCommon
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/hwui/AnimatorManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/AnimatorManager.cpp b/libs/hwui/AnimatorManager.cpp index 966959a..0dababd 100644 --- a/libs/hwui/AnimatorManager.cpp +++ b/libs/hwui/AnimatorManager.cpp @@ -117,7 +117,6 @@ uint32_t AnimatorManager::animate(TreeInfo& info) { uint32_t dirty = animateCommon(info); - mParent.mProperties.updateMatrix(); info.damageAccumulator->pushTransform(&mParent); mParent.damageSelf(info); @@ -136,6 +135,7 @@ uint32_t AnimatorManager::animateCommon(TreeInfo& info) { newEnd = std::remove_if(mAnimators.begin(), mAnimators.end(), functor); mAnimators.erase(newEnd, mAnimators.end()); mAnimationHandle->notifyAnimationsRan(); + mParent.mProperties.updateMatrix(); return functor.dirtyMask; } |