am 6f3e7bbf: Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev

* commit '6f3e7bbf14d43553dfca6a59bbbb1c6ee19a70fc':
  Fix for previous commit on non-interesecting invalidations
This commit is contained in:
Chet Haase
2012-10-17 14:55:50 -07:00
committed by Android Git Automerger

View File

@@ -890,9 +890,10 @@ public final class ViewRootImpl implements ViewParent,
// updates that lie outside of the visible region
final float appScale = mAttachInfo.mApplicationScale;
if (localDirty.intersect(0, 0,
(int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f)) &&
!mWillDrawSoon) {
scheduleTraversals();
(int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f))) {
if (!mWillDrawSoon) {
scheduleTraversals();
}
} else {
localDirty.setEmpty();
}