Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c18fa35 authored by Jon Miranda's avatar Jon Miranda Committed by Android (Google) Code Review
Browse files

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

parents 98add1c5 59d12147
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -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;
                    }
                }