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

Merge "Update layout direction if ViewRoot is preserved" into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-10-12 13:39:45 +00:00
committed by Android (Google) Code Review
parent 1b6a2bacca 39ef5efaa5
commit 3c282790e4
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1102,7 +1102,7 @@ public final class ViewRootImpl implements ViewParent,
// Update the last resource config in case the resource configuration was changed while // Update the last resource config in case the resource configuration was changed while
// activity relaunched. // activity relaunched.
mLastConfigurationFromResources.setTo(getConfiguration()); updateLastConfigurationFromResources(getConfiguration());
} }
private Configuration getConfiguration() { private Configuration getConfiguration() {
@@ -5396,13 +5396,7 @@ public final class ViewRootImpl implements ViewParent,
// Update the display with new DisplayAdjustments. // Update the display with new DisplayAdjustments.
updateInternalDisplay(mDisplay.getDisplayId(), localResources); updateInternalDisplay(mDisplay.getDisplayId(), localResources);
final int lastLayoutDirection = mLastConfigurationFromResources.getLayoutDirection(); updateLastConfigurationFromResources(config);
final int currentLayoutDirection = config.getLayoutDirection();
mLastConfigurationFromResources.setTo(config);
if (lastLayoutDirection != currentLayoutDirection
&& mViewLayoutDirectionInitial == View.LAYOUT_DIRECTION_INHERIT) {
mView.setLayoutDirection(currentLayoutDirection);
}
mView.dispatchConfigurationChanged(config); mView.dispatchConfigurationChanged(config);
// We could have gotten this {@link Configuration} update after we called // We could have gotten this {@link Configuration} update after we called
@@ -5416,6 +5410,17 @@ public final class ViewRootImpl implements ViewParent,
updateForceDarkMode(); updateForceDarkMode();
} }
private void updateLastConfigurationFromResources(Configuration resConfig) {
final int lastLayoutDirection = mLastConfigurationFromResources.getLayoutDirection();
final int currentLayoutDirection = resConfig.getLayoutDirection();
mLastConfigurationFromResources.setTo(resConfig);
// Update layout direction in case the language or screen layout is changed.
if (lastLayoutDirection != currentLayoutDirection && mView != null
&& mViewLayoutDirectionInitial == View.LAYOUT_DIRECTION_INHERIT) {
mView.setLayoutDirection(currentLayoutDirection);
}
}
/** /**
* Return true if child is an ancestor of parent, (or equal to the parent). * Return true if child is an ancestor of parent, (or equal to the parent).
*/ */