Merge "Skip drawing offscreen objects" into jb-mr1-dev

2012-10-17 12:36:23 -07:00
parent 16627347ef b78ee0ef60
commit d95316e2c7
1 changed files with 5 additions and 4 deletions
--- a/core/java/android/view/ViewRootImpl.java
+++ b/core/java/android/view/ViewRootImpl.java
@@ -887,11 +887,12 @@ public final class ViewRootImpl implements ViewParent,
        // Intersect with the bounds of the window to skip
        // updates that lie outside of the visible region
        final float appScale = mAttachInfo.mApplicationScale;
-        localDirty.intersect(0, 0,
-                (int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f));
-
-        if (!mWillDrawSoon) {
+        if (localDirty.intersect(0, 0,
+                (int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f)) &&
+                !mWillDrawSoon) {
            scheduleTraversals();
+        } else {
+            localDirty.setEmpty();
        }

        return null;