Merge \"Revert changes to force layout after insets changes\" into nyc-mr1-dev

            }

            boolean hwInitialized = false;

            boolean framesChanged = false;

            boolean contentInsetsChanged = false;

            boolean hadSurface = mSurface.isValid();

            try {

                final boolean overscanInsetsChanged = !mPendingOverscanInsets.equals(

                        mAttachInfo.mOverscanInsets);

                boolean contentInsetsChanged = !mPendingContentInsets.equals(

                contentInsetsChanged = !mPendingContentInsets.equals(

                        mAttachInfo.mContentInsets);

                final boolean visibleInsetsChanged = !mPendingVisibleInsets.equals(

                        mAttachInfo.mVisibleInsets);

                            + mAttachInfo.mVisibleInsets);

                }

                // If any of the insets changed, do a forceLayout on the view so that the

                // measure cache is cleared. We might have a pending MSG_RESIZED_REPORT

                // that is supposed to take care of it, but since pending insets are

                // already modified here, it won't detect the frame change after this.

                framesChanged = overscanInsetsChanged

                        || contentInsetsChanged

                        || stableInsetsChanged

                        || visibleInsetsChanged

                        || outsetsChanged;

                if (mAdded && mView != null && framesChanged) {

                    forceLayout(mView);

                }

                if (!hadSurface) {

                    if (mSurface.isValid()) {

                        // If we are creating a new surface, then we need to

                boolean focusChangedDueToTouchMode = ensureTouchModeLocally(

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

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

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

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

                        updatedConfiguration) {

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

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

                            + mWidth + " measuredWidth=" + host.getMeasuredWidth()

                            + " mHeight=" + mHeight

                            + " measuredHeight=" + host.getMeasuredHeight()

                            + " framesChanged=" + framesChanged);

                            + " coveredInsetsChanged=" + contentInsetsChanged);

                     // Ask host how big it wants to be

                    performMeasure(childWidthMeasureSpec, childHeightMeasureSpec);