Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix layout issue after insets changed" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-06-24 23:21:28 +00:00
committed by Android (Google) Code Review
parent 8afc1f70f0 76fdbb72c9
commit 119f1715b3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/view/ViewRootImpl.java
View File

@@ -1723,7 +1723,7 @@ public final class ViewRootImpl implements ViewParent,
} }
boolean hwInitialized = false; boolean hwInitialized = false;
boolean contentInsetsChanged = false; boolean framesChanged = false;
boolean hadSurface = mSurface.isValid(); boolean hadSurface = mSurface.isValid();
try { try {
@@ -1763,7 +1763,7 @@ public final class ViewRootImpl implements ViewParent,
final boolean overscanInsetsChanged = !mPendingOverscanInsets.equals( final boolean overscanInsetsChanged = !mPendingOverscanInsets.equals(
mAttachInfo.mOverscanInsets); mAttachInfo.mOverscanInsets);
contentInsetsChanged = !mPendingContentInsets.equals( boolean contentInsetsChanged = !mPendingContentInsets.equals(
mAttachInfo.mContentInsets); mAttachInfo.mContentInsets);
final boolean visibleInsetsChanged = !mPendingVisibleInsets.equals( final boolean visibleInsetsChanged = !mPendingVisibleInsets.equals(
mAttachInfo.mVisibleInsets); mAttachInfo.mVisibleInsets);
@@ -1817,7 +1817,7 @@ public final class ViewRootImpl implements ViewParent,
// measure cache is cleared. We might have a pending MSG_RESIZED_REPORT // 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 // 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. // already modified here, it won't detect the frame change after this.
final boolean framesChanged = overscanInsetsChanged framesChanged = overscanInsetsChanged
|| contentInsetsChanged || contentInsetsChanged
|| stableInsetsChanged || stableInsetsChanged
|| visibleInsetsChanged || visibleInsetsChanged
@@ -2009,7 +2009,7 @@ 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() || framesChanged ||
updatedConfiguration) { 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);
@@ -2018,7 +2018,7 @@ public final class ViewRootImpl implements ViewParent,
+ mWidth + " measuredWidth=" + host.getMeasuredWidth() + mWidth + " measuredWidth=" + host.getMeasuredWidth()
+ " mHeight=" + mHeight + " mHeight=" + mHeight
+ " measuredHeight=" + host.getMeasuredHeight() + " measuredHeight=" + host.getMeasuredHeight()
+ " coveredInsetsChanged=" + contentInsetsChanged); + " framesChanged=" + framesChanged);
// Ask host how big it wants to be // Ask host how big it wants to be
performMeasure(childWidthMeasureSpec, childHeightMeasureSpec); performMeasure(childWidthMeasureSpec, childHeightMeasureSpec);