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

Commit 47f4d2f2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Keep display density constant"

parents 6f417b3e e82d20c3

services/core/java/com/android/server/wm/DisplayContent.java

+1 −3
Original line number Diff line number Diff line
@@ -2417,13 +2417,11 @@ class DisplayContent extends DisplayArea.Root implements WindowManagerPolicy.Dis 


        if (mMaxUiWidth > 0 && mBaseDisplayWidth > mMaxUiWidth) {

            mBaseDisplayHeight = (mMaxUiWidth * mBaseDisplayHeight) / mBaseDisplayWidth;

            mBaseDisplayDensity = (mMaxUiWidth * mBaseDisplayDensity) / mBaseDisplayWidth;

            mBaseDisplayWidth = mMaxUiWidth;



            if (DEBUG_DISPLAY) {

                Slog.v(TAG_WM, "Applying config restraints:" + mBaseDisplayWidth + "x"

                        + mBaseDisplayHeight + " at density:" + mBaseDisplayDensity

                        + " on display:" + getDisplayId());

                        + mBaseDisplayHeight + " on display:" + getDisplayId());

            }

        }

services/tests/wmtests/src/com/android/server/wm/DisplayContentTests.java

+1 −1
Original line number Diff line number Diff line
@@ -527,7 +527,7 @@ public class DisplayContentTests extends WindowTestsBase { 


        final int maxWidth = 300;

        final int resultingHeight = (maxWidth * baseHeight) / baseWidth;

        final int resultingDensity = (maxWidth * baseDensity) / baseWidth;

        final int resultingDensity = baseDensity;



        displayContent.setMaxUiWidth(maxWidth);

        verifySizes(displayContent, maxWidth, resultingHeight, resultingDensity);