Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1

Browse Source
This commit is contained in:
Adam Powell
2011-12-12 15:40:00 -08:00
committed by Android (Google) Code Review
parent a1dee3f500 f93bb6d8fd
commit 9c92fcd91c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/java/android/view/ViewGroup.java
View File

@@ -4176,10 +4176,10 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
* {@inheritDoc}
*/
public boolean getChildVisibleRect(View child, Rect r, android.graphics.Point offset) {
// The View is not attached to a window, 'visible' does not make sense, return false
if (mAttachInfo == null) return false;
final RectF rect = mAttachInfo.mTmpTransformRect;
// It doesn't make a whole lot of sense to call this on a view that isn't attached,
// but for some simple tests it can be useful. If we don't have attach info this
// will allocate memory.
final RectF rect = mAttachInfo != null ? mAttachInfo.mTmpTransformRect : new RectF();
rect.set(r);
if (!child.hasIdentityMatrix()) {
@@ -4193,7 +4193,8 @@ public abstract class ViewGroup extends View implements ViewParent, ViewManager
if (offset != null) {
if (!child.hasIdentityMatrix()) {
float[] position = mAttachInfo.mTmpTransformLocation;
float[] position = mAttachInfo != null ? mAttachInfo.mTmpTransformLocation
: new float[2];
position[0] = offset.x;
position[1] = offset.y;
child.getMatrix().mapPoints(position);