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

Merge "ViewRootImpl: Ensure layout when configuration changes." into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-06-22 00:04:19 +00:00
committed by Android (Google) Code Review
parent 019e1bf3fb 437c0e4c15
commit 6397ab05f9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4453,6 +4453,7 @@ public final class ViewRootImpl implements ViewParent,
final int displayId = args.argi3; final int displayId = args.argi3;
MergedConfiguration mergedConfiguration = (MergedConfiguration) args.arg4; MergedConfiguration mergedConfiguration = (MergedConfiguration) args.arg4;
final boolean displayChanged = mDisplay.getDisplayId() != displayId; final boolean displayChanged = mDisplay.getDisplayId() != displayId;
boolean configChanged = false;
if (!mLastReportedMergedConfiguration.equals(mergedConfiguration)) { if (!mLastReportedMergedConfiguration.equals(mergedConfiguration)) {
// If configuration changed - notify about that and, maybe, // If configuration changed - notify about that and, maybe,
@@ -4460,6 +4461,7 @@ public final class ViewRootImpl implements ViewParent,
performConfigurationChange(mergedConfiguration, false /* force */, performConfigurationChange(mergedConfiguration, false /* force */,
displayChanged displayChanged
? displayId : INVALID_DISPLAY /* same display */); ? displayId : INVALID_DISPLAY /* same display */);
configChanged = true;
} else if (displayChanged) { } else if (displayChanged) {
// Moved to display without config change - report last applied one. // Moved to display without config change - report last applied one.
onMovedToDisplay(displayId, mLastConfigurationFromResources); onMovedToDisplay(displayId, mLastConfigurationFromResources);
@@ -4490,7 +4492,7 @@ public final class ViewRootImpl implements ViewParent,
reportNextDraw(); reportNextDraw();
} }
if (mView != null && framesChanged) { if (mView != null && (framesChanged || configChanged)) {
forceLayout(mView); forceLayout(mView);
} }
requestLayout(); requestLayout();