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

Author: chethaase

core/java/android/view/ViewRootImpl.java

@@ -887,11 +887,12 @@ public ViewParent invalidateChildInParent(int[] location, Rect dirty) {
         // 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;