Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8c2abca authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am bffe0be3: am 9c92fcd9: Merge "Bug 5727679 - CTS test... 

am bffe0be3: am 9c92fcd9: Merge "Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect" into ics-mr1

* commit 'bffe0be3':
  Bug 5727679 - CTS test ViewGroupTest#testGetChildVisibleRect
parents 36838993 bffe0be3

core/java/android/view/ViewGroup.java

+6 −5
Original line number Diff line number Diff line
@@ -4190,10 +4190,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()) {
@@ -4207,7 +4207,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);