Merge "Remove ActivityInfo.CONFIG_SCREEN_SIZE if orientation is still the same." into udc-dev

This commit is contained in:
Jon Miranda authored and Android (Google) Code Review committed 2023-04-19 18:04:27 +00:00
commit 5c18fa35b2
1 file changed
+6 -1
@@ -168,9 +168,14 @@ public class TaskbarManager {
DeviceProfile oldDp = mTaskbarActivityContext.getDeviceProfile();
boolean isOrientationChange =
(configDiff & ActivityInfo.CONFIG_ORIENTATION) != 0;
int newOrientation = newConfig.windowConfiguration.getRotation();
int oldOrientation = mOldConfig.windowConfiguration.getRotation();
int oldWidth = isOrientationChange ? oldDp.heightPx : oldDp.widthPx;
int oldHeight = isOrientationChange ? oldDp.widthPx : oldDp.heightPx;
if (dp.widthPx == oldWidth && dp.heightPx == oldHeight) {
if ((dp.widthPx == oldWidth && dp.heightPx == oldHeight)
|| (newOrientation == oldOrientation)) {
configDiffForRecreate &= ~ActivityInfo.CONFIG_SCREEN_SIZE;
}
}