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

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

Browse Source
This commit is contained in:
Chet Haase
2016-05-04 21:49:09 +00:00
committed by Android (Google) Code Review
parent 68c1e1935d d86fb2ce37
commit c381c4e8e7
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);