Merge "Use the TaskFragment override screenLayout for fix rotation" into tm-qpr-dev am: 1f2487e2a0

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18910442

Change-Id: If90334afd24b26761b8b5c2292606a9f30a797e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Louis Chang
2022-06-21 00:58:06 +00:00
committed by Automerger Merge Worker

View File

@@ -448,8 +448,14 @@ class WindowToken extends WindowContainer<WindowState> {
if (mFixedRotationTransformState != null) {
mFixedRotationTransformState.disassociate(this);
}
// TODO(b/233855302): Remove TaskFragment override if the DisplayContent uses the same
// bounds for screenLayout calculation.
final Configuration overrideConfig = new Configuration(config);
overrideConfig.screenLayout = TaskFragment.computeScreenLayoutOverride(
overrideConfig.screenLayout, overrideConfig.screenWidthDp,
overrideConfig.screenHeightDp);
mFixedRotationTransformState = new FixedRotationTransformState(info, displayFrames,
new Configuration(config), mDisplayContent.getRotation());
overrideConfig, mDisplayContent.getRotation());
mFixedRotationTransformState.mAssociatedTokens.add(this);
mDisplayContent.getDisplayPolicy().simulateLayoutDisplay(displayFrames);
onFixedRotationStatePrepared();