Skip to content

Commit 6f3e7bb

Browse files
chethaaseAndroid (Google) Code Review
authored andcommitted
Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev
2 parents 3301654 + 9911d18 commit 6f3e7bb

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

core/java/android/view/ViewRootImpl.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -888,9 +888,10 @@ public ViewParent invalidateChildInParent(int[] location, Rect dirty) {
888888
// updates that lie outside of the visible region
889889
final float appScale = mAttachInfo.mApplicationScale;
890890
if (localDirty.intersect(0, 0,
891-
(int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f)) &&
892-
!mWillDrawSoon) {
893-
scheduleTraversals();
891+
(int) (mWidth * appScale + 0.5f), (int) (mHeight * appScale + 0.5f))) {
892+
if (!mWillDrawSoon) {
893+
scheduleTraversals();
894+
}
894895
} else {
895896
localDirty.setEmpty();
896897
}

0 commit comments

Comments
 (0)