Merge "Fixing View.getBoundsOnScreen()" into jb-dev

sganov · Android (Google) Code Review · commit a3b6728933c1 · 2012-05-08T16:49:13.000-07:00
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
@@ -4676,13 +4676,13 @@ private void getBoundsOnScreen(Rect outRect) {
         }
 
         RectF position = mAttachInfo.mTmpTransformRect;
-        position.setEmpty();
+        position.set(0, 0, mRight - mLeft, mBottom - mTop);
 
         if (!hasIdentityMatrix()) {
             getMatrix().mapRect(position);
         }
 
-        position.offset(mLeft, mRight);
+        position.offset(mLeft, mTop);
 
         ViewParent parent = mParent;
         while (parent instanceof View) {

Original file line number	Diff line number	Diff line change
`@@ -4676,13 +4676,13 @@ private void getBoundsOnScreen(Rect outRect) {`
`4676`	`4676`	`}`
`4677`	`4677`
`4678`	`4678`	`RectF position = mAttachInfo.mTmpTransformRect;`
`4679`		`- position.setEmpty();`
	`4679`	`+ position.set(0, 0, mRight - mLeft, mBottom - mTop);`
`4680`	`4680`
`4681`	`4681`	`if (!hasIdentityMatrix()) {`
`4682`	`4682`	`getMatrix().mapRect(position);`
`4683`	`4683`	`}`
`4684`	`4684`
`4685`		`- position.offset(mLeft, mRight);`
	`4685`	`+ position.offset(mLeft, mTop);`
`4686`	`4686`
`4687`	`4687`	`ViewParent parent = mParent;`
`4688`	`4688`	`while (parent instanceof View) {`