Merge "Dirty rect must expand, not contract." into jb-mr2-dev

1 files changed, 4 insertions, 4 deletions

diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 7f09a6aac457..0cd7c6e1c668 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10578,10 +10578,10 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
             RectF boundingRect = mAttachInfo.mTmpTransformRect;
             boundingRect.set(rect);
             getMatrix().mapRect(boundingRect);
-            rect.set((int) (boundingRect.left - 0.5f),
-                    (int) (boundingRect.top - 0.5f),
-                    (int) (boundingRect.right + 0.5f),
-                    (int) (boundingRect.bottom + 0.5f));
+            rect.set((int) Math.floor(boundingRect.left),
+                    (int) Math.floor(boundingRect.top),
+                    (int) Math.ceil(boundingRect.right),
+                    (int) Math.ceil(boundingRect.bottom));
         }
     }