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

Commit 3ec859ec authored by Ebru Kurnaz's avatar Ebru Kurnaz
Browse files

Use 9 stop slider instead of 5 for external displays. 

Bug: 417680647
Test: DisplayDensityUtilsTest
Flag: EXEMPT bug fix
Change-Id: Icda2068403b32055c8317f9efd69aa2ac8a311d6
parent 9449efd8

packages/SettingsLib/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
    <!-- Maximum density scale for external displays. -->

    <fraction name="external_display_density_max_scale">150%</fraction>

    <!-- Minimum density scale for external displays. -->

    <fraction name="external_display_density_min_scale">80%</fraction>

    <fraction name="external_display_density_min_scale">70%</fraction>

    <!-- Maximum density scale for external displays for 9 stops. -->

    <fraction name="external_display_density_max_scale_extended">200%</fraction>

    <!-- Minimum density scale for external displays for 9 stops. -->

packages/SettingsLib/src/com/android/settingslib/display/DisplayDensityUtils.java

+5 −12
Original line number Diff line number Diff line
@@ -217,19 +217,12 @@ public class DisplayDensityUtils { 
            summariesSmaller = SUMMARIES_SMALLER;

            summariesLarger = SUMMARIES_LARGER;

        } else {

            if (currentDisplayInfo.physicalXDpi > 0 && currentDisplayInfo.physicalYDpi > 0) {

            // Use bigger range of density values for external displays.

            maxScaleFraction = R.fraction.external_display_density_max_scale;

            minScaleFraction = R.fraction.external_display_density_min_scale;

                summariesSmaller = SUMMARIES_SMALLER;

                summariesLarger = SUMMARIES_LARGER;

            } else {

                // Use bigger range if the display xDPI or yDPI is missing.

                maxScaleFraction = R.fraction.external_display_density_max_scale_extended;

                minScaleFraction = R.fraction.external_display_density_min_scale_extended;

            summariesSmaller = SUMMARIES_SMALLER_EXTENDED;

            summariesLarger = SUMMARIES_LARGER_EXTENDED;

        }

        }



        // Compute number of "larger" and "smaller" scales for this display.

        final int maxDensity =

packages/SettingsLib/tests/integ/src/com/android/settingslib/display/DisplayDensityUtilsTest.java

+8 −7
Original line number Diff line number Diff line
@@ -135,9 +135,9 @@ public class DisplayDensityUtilsTest { 
    public void createDisplayDensityUtil_forExternalDisplay() throws RemoteException {

        // Configure resources

        when(mResources.getFraction(R.fraction.external_display_density_max_scale,

                1, 1)).thenReturn(MAX_SCALE_EXTERNAL);

                1, 1)).thenReturn(MAX_SCALE_EXTERNAL_EXTENDED);

        when(mResources.getFraction(R.fraction.external_display_density_min_scale,

                1, 1)).thenReturn(MIN_SCALE_EXTERNAL);

                1, 1)).thenReturn(MIN_SCALE_EXTERNAL_EXTENDED);

        // Default display

        var defaultDisplayInfo = createDisplayInfoForDisplay(

                Display.DEFAULT_DISPLAY, Display.TYPE_INTERNAL, 2000, 2000,
@@ -162,16 +162,17 @@ public class DisplayDensityUtilsTest { 
        mDisplayDensityUtils = new DisplayDensityUtils(mContext,

                (info) -> info.displayId == externalDisplayInfo.displayId);



        assertThat(mDisplayDensityUtils.getValues()).isEqualTo(new int[]{68, 85, 98, 112, 126});

        assertThat(mDisplayDensityUtils.getValues())

                .isEqualTo(new int[]{42, 56, 70, 85, 102, 118, 136, 152, 170});

    }



    @Test

    public void createDisplayDensityUtil_forExternalDisplay_displaySizeMissing()

            throws RemoteException {

        // Configure resources

        when(mResources.getFraction(R.fraction.external_display_density_max_scale_extended,

        when(mResources.getFraction(R.fraction.external_display_density_max_scale,

                1, 1)).thenReturn(MAX_SCALE_EXTERNAL_EXTENDED);

        when(mResources.getFraction(R.fraction.external_display_density_min_scale_extended,

        when(mResources.getFraction(R.fraction.external_display_density_min_scale,

                1, 1)).thenReturn(MIN_SCALE_EXTERNAL_EXTENDED);

        // Default display

        var defaultDisplayInfo = createDisplayInfoForDisplay(
@@ -206,9 +207,9 @@ public class DisplayDensityUtilsTest { 
    public void createDisplayDensityUtil_forExternalDisplay_lowerMaxScale()

            throws RemoteException {

        // Configure resources

        when(mResources.getFraction(R.fraction.external_display_density_max_scale_extended,

        when(mResources.getFraction(R.fraction.external_display_density_max_scale,

                1, 1)).thenReturn(MAX_SCALE_EXTERNAL_EXTENDED);

        when(mResources.getFraction(R.fraction.external_display_density_min_scale_extended,

        when(mResources.getFraction(R.fraction.external_display_density_min_scale,

                1, 1)).thenReturn(MIN_SCALE_EXTERNAL_EXTENDED);

        // Default display

        var defaultDisplayInfo = createDisplayInfoForDisplay(