diff options
| author | 2016-06-24 23:33:15 +0000 | |
|---|---|---|
| committer | 2016-06-24 23:33:15 +0000 | |
| commit | a01b7d7f546d7764429caca7541900a08eea4cb6 (patch) | |
| tree | b39611c25984c54603f5722d76202a243cf31b0f | |
| parent | 366f7476eaf550c1e9cb08e12e766e9568115b98 (diff) | |
| parent | c43c9e052e0928abd9648a442a5b1acfa21a8fc7 (diff) | |
Merge \\"Fix layout issue after insets changed\\" into nyc-dev am: 119f1715b3
am: c43c9e052e
Change-Id: I3939df24a6057111ef5f350e5ec1c1214e96b6b4
| -rw-r--r-- | core/java/android/view/ViewRootImpl.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/core/java/android/view/ViewRootImpl.java b/core/java/android/view/ViewRootImpl.java index 68518571e3ff..c42752287a42 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1731,7 +1731,7 @@ public final class ViewRootImpl implements ViewParent, } boolean hwInitialized = false; - boolean contentInsetsChanged = false; + boolean framesChanged = false; boolean hadSurface = mSurface.isValid(); try { @@ -1771,7 +1771,7 @@ public final class ViewRootImpl implements ViewParent, final boolean overscanInsetsChanged = !mPendingOverscanInsets.equals( mAttachInfo.mOverscanInsets); - contentInsetsChanged = !mPendingContentInsets.equals( + boolean contentInsetsChanged = !mPendingContentInsets.equals( mAttachInfo.mContentInsets); final boolean visibleInsetsChanged = !mPendingVisibleInsets.equals( mAttachInfo.mVisibleInsets); @@ -1825,7 +1825,7 @@ public final class ViewRootImpl implements ViewParent, // 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. - final boolean framesChanged = overscanInsetsChanged + framesChanged = overscanInsetsChanged || contentInsetsChanged || stableInsetsChanged || visibleInsetsChanged @@ -2017,7 +2017,7 @@ public final class ViewRootImpl implements ViewParent, boolean focusChangedDueToTouchMode = ensureTouchModeLocally( (relayoutResult&WindowManagerGlobal.RELAYOUT_RES_IN_TOUCH_MODE) != 0); if (focusChangedDueToTouchMode || mWidth != host.getMeasuredWidth() - || mHeight != host.getMeasuredHeight() || contentInsetsChanged || + || mHeight != host.getMeasuredHeight() || framesChanged || updatedConfiguration) { int childWidthMeasureSpec = getRootMeasureSpec(mWidth, lp.width); int childHeightMeasureSpec = getRootMeasureSpec(mHeight, lp.height); @@ -2026,7 +2026,7 @@ public final class ViewRootImpl implements ViewParent, + mWidth + " measuredWidth=" + host.getMeasuredWidth() + " mHeight=" + mHeight + " measuredHeight=" + host.getMeasuredHeight() - + " coveredInsetsChanged=" + contentInsetsChanged); + + " framesChanged=" + framesChanged); // Ask host how big it wants to be performMeasure(childWidthMeasureSpec, childHeightMeasureSpec); |