summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2013-05-15 13:49:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-15 13:49:48 -0700
commitf27796cbbea78b01467a5a35f20be573815c1b5b (patch)
treea8e1e669f1cdc4aec9d27f2667df9cabab1bde9a
parent5d0db65e734b8d3ee1cef5a51b327bb4f12cb5b0 (diff)
parent944a8725e6e2ccb310c9515c9067f995c034b724 (diff)
downloadframeworks_base-f27796cbbea78b01467a5a35f20be573815c1b5b.zip
frameworks_base-f27796cbbea78b01467a5a35f20be573815c1b5b.tar.gz
frameworks_base-f27796cbbea78b01467a5a35f20be573815c1b5b.tar.bz2
am 944a8725: am bee0495f: Merge "Dirty rect must expand, not contract." into jb-mr2-dev
* commit '944a8725e6e2ccb310c9515c9067f995c034b724': Dirty rect must expand, not contract.
-rw-r--r--core/java/android/view/View.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index f2ec4b4..4dc2682 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -10614,10 +10614,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));
}
}