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

Commit 92b46ffb authored by Romain Guy's avatar Romain Guy Committed by Android Git Automerger
Browse files

am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo 

Merge commit 'bd4808dc' into froyo-plus-aosp

* commit 'bd4808dc':
  Correctly resize dialogs when measured in WRAP_CONTENT
parents 710312b3 bd4808dc

core/java/android/view/ViewRoot.java

+5 −1
Original line number Diff line number Diff line
@@ -852,7 +852,11 @@ public final class ViewRoot extends Handler implements ViewParent, 
        }



        boolean windowShouldResize = mLayoutRequested && windowResizesToFitContent

            && (mWidth != host.mMeasuredWidth || mHeight != host.mMeasuredHeight);

            && ((mWidth != host.mMeasuredWidth || mHeight != host.mMeasuredHeight)

                || (lp.width == ViewGroup.LayoutParams.WRAP_CONTENT &&

                        frame.width() < desiredWindowWidth && frame.width() != mWidth)

                || (lp.height == ViewGroup.LayoutParams.WRAP_CONTENT &&

                        frame.height() < desiredWindowHeight && frame.height() != mHeight));



        final boolean computesInternalInsets =

                attachInfo.mTreeObserver.hasComputeInternalInsetsListeners();