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

Commit 057e860c authored by Chet Haase's avatar Chet Haase Committed by android-build-merger
Browse files

Merge "Force second measure pass when there is a configuration change" into nyc-dev am: c381c4e8 

am: 512c406b

* commit '512c406b':
  Force second measure pass when there is a configuration change

Change-Id: Idba5f43d8dfff9cc812c5b66dbff04f5fa8b6dfe
parents 2518ff6a 512c406b

core/java/android/view/ViewRootImpl.java

+4 −1
Original line number Original line Diff line number Diff line
@@ -1679,6 +1679,7 @@ public final class ViewRootImpl implements ViewParent, 




        boolean insetsPending = false;

        boolean insetsPending = false;

        int relayoutResult = 0;

        int relayoutResult = 0;

        boolean updatedConfiguration = false;





        final int surfaceGenerationId = mSurface.getGenerationId();

        final int surfaceGenerationId = mSurface.getGenerationId();
@@ -1741,6 +1742,7 @@ public final class ViewRootImpl implements ViewParent, 
                            + mPendingConfiguration);

                            + mPendingConfiguration);

                    updateConfiguration(new Configuration(mPendingConfiguration), !mFirst);

                    updateConfiguration(new Configuration(mPendingConfiguration), !mFirst);

                    mPendingConfiguration.seq = 0;

                    mPendingConfiguration.seq = 0;

                    updatedConfiguration = true;

                }

                }





                final boolean overscanInsetsChanged = !mPendingOverscanInsets.equals(

                final boolean overscanInsetsChanged = !mPendingOverscanInsets.equals(
@@ -1978,7 +1980,8 @@ public final class ViewRootImpl implements ViewParent, 
                boolean focusChangedDueToTouchMode = ensureTouchModeLocally(

                boolean focusChangedDueToTouchMode = ensureTouchModeLocally(

                        (relayoutResult&WindowManagerGlobal.RELAYOUT_RES_IN_TOUCH_MODE) != 0);

                        (relayoutResult&WindowManagerGlobal.RELAYOUT_RES_IN_TOUCH_MODE) != 0);

                if (focusChangedDueToTouchMode || mWidth != host.getMeasuredWidth()

                if (focusChangedDueToTouchMode || mWidth != host.getMeasuredWidth()

                        || mHeight != host.getMeasuredHeight() || contentInsetsChanged) {

                        || mHeight != host.getMeasuredHeight() || contentInsetsChanged ||

                        updatedConfiguration) {

                    int childWidthMeasureSpec = getRootMeasureSpec(mWidth, lp.width);

                    int childWidthMeasureSpec = getRootMeasureSpec(mWidth, lp.width);

                    int childHeightMeasureSpec = getRootMeasureSpec(mHeight, lp.height);

                    int childHeightMeasureSpec = getRootMeasureSpec(mHeight, lp.height);