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

Commit c18c6da4 authored by Adrian Roos's avatar Adrian Roos
Browse files

RootViewImpl: Fix measure size hint for WRAP_CONTENT windows 

Fixes an issue where we would measure WRAP_CONTENT windows inconsistently
in the measure passes before and after relayoutWindow.

Fixes: 119839070
Bug: 73813813
Change-Id: I376e416d648f31a0dedecd6a70b476c3bf82b8b0
Test: Install test case app from 119839070, verify dialog is correctly laid out.
parent 2cf040d6

core/java/android/view/ViewRootImpl.java

+11 −2
Original line number Diff line number Diff line
@@ -2001,9 +2001,18 @@ public final class ViewRootImpl implements ViewParent, 
                mDisplay.getRealSize(size);

                desiredWindowWidth = size.x;

                desiredWindowHeight = size.y;

            } else if (lp.width == ViewGroup.LayoutParams.WRAP_CONTENT

                    || lp.height == ViewGroup.LayoutParams.WRAP_CONTENT) {

                // For wrap content, we have to remeasure later on anyways. Use size consistent with

                // below so we get best use of the measure cache.

                desiredWindowWidth = dipToPx(config.screenWidthDp);

                desiredWindowHeight = dipToPx(config.screenHeightDp);

            } else {

                desiredWindowWidth = mWinFrame.width();

                desiredWindowHeight = mWinFrame.height();

                // After addToDisplay, the frame contains the frameHint from window manager, which

                // for most windows is going to be the same size as the result of relayoutWindow.

                // Using this here allows us to avoid remeasuring after relayoutWindow

                desiredWindowWidth = frame.width();

                desiredWindowHeight = frame.height();

            }



            // We used to use the following condition to choose 32 bits drawing caches: