diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-06-24 23:21:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-06-24 23:21:29 +0000 |
| commit | 119f1715b3f9443d085f40c9c677dfdc11a032bd (patch) | |
| tree | 683bfa6897f05618c5ce4334aa835e4a57ba093d | |
| parent | 8afc1f70f031f8385e5f15ddd4f4304243925f8a (diff) | |
| parent | 76fdbb72c93a431e14357e0ea3d5a83edfa75c5e (diff) | |
| download | base-119f1715b3f9443d085f40c9c677dfdc11a032bd.tar.gz | |
Merge "Fix layout issue after insets changed" into nyc-dev
| -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 b3daa16dd86f..195786dfcf2a 100644 --- a/core/java/android/view/ViewRootImpl.java +++ b/core/java/android/view/ViewRootImpl.java @@ -1723,7 +1723,7 @@ public final class ViewRootImpl implements ViewParent, } boolean hwInitialized = false; - boolean contentInsetsChanged = false; + boolean framesChanged = false; boolean hadSurface = mSurface.isValid(); try { @@ -1763,7 +1763,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); @@ -1817,7 +1817,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 @@ -2009,7 +2009,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); @@ -2018,7 +2018,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); |