Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Move updateMatrix() call to animateCommon" into mnc-dev

Browse Source
This commit is contained in:
John Reck
2015-07-23 23:48:40 +00:00
committed by Android (Google) Code Review
parent f199ac84f3 49dec430e8
commit 8b1154c487
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/hwui/AnimatorManager.cpp
View File

@@ -117,7 +117,6 @@ uint32_t AnimatorManager::animate(TreeInfo& info) {
uint32_t dirty = animateCommon(info); uint32_t dirty = animateCommon(info);
mParent.mProperties.updateMatrix();
info.damageAccumulator->pushTransform(&mParent); info.damageAccumulator->pushTransform(&mParent);
mParent.damageSelf(info); mParent.damageSelf(info);
@@ -136,6 +135,7 @@ uint32_t AnimatorManager::animateCommon(TreeInfo& info) {
newEnd = std::remove_if(mAnimators.begin(), mAnimators.end(), functor); newEnd = std::remove_if(mAnimators.begin(), mAnimators.end(), functor);
mAnimators.erase(newEnd, mAnimators.end()); mAnimators.erase(newEnd, mAnimators.end());
mAnimationHandle->notifyAnimationsRan(); mAnimationHandle->notifyAnimationsRan();
mParent.mProperties.updateMatrix();
return functor.dirtyMask; return functor.dirtyMask;
} }