Merge "Use the TaskFragment override screenLayout for fix rotation" into tm-qpr-dev

This commit is contained in:
Louis Chang
2022-06-21 00:37:54 +00:00
committed by Android (Google) Code Review

View File

@@ -448,8 +448,14 @@ class WindowToken extends WindowContainer<WindowState> {
if (mFixedRotationTransformState != null) { if (mFixedRotationTransformState != null) {
mFixedRotationTransformState.disassociate(this); 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, mFixedRotationTransformState = new FixedRotationTransformState(info, displayFrames,
new Configuration(config), mDisplayContent.getRotation()); overrideConfig, mDisplayContent.getRotation());
mFixedRotationTransformState.mAssociatedTokens.add(this); mFixedRotationTransformState.mAssociatedTokens.add(this);
mDisplayContent.getDisplayPolicy().simulateLayoutDisplay(displayFrames); mDisplayContent.getDisplayPolicy().simulateLayoutDisplay(displayFrames);
onFixedRotationStatePrepared(); onFixedRotationStatePrepared();