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

Commit 2b6744da authored by Massimo Carli's avatar Massimo Carli Committed by Automerger Merge Worker
Browse files

Merge "Add 1.05 and 1.2 as new possible font scale values" into 24D1-dev am: c8f57e17 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/26818772



Change-Id: I18dbdd3e7e175ab3878a2620d230ff7b3fc3c31f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c3117bfe c8f57e17

core/java/android/content/res/FontScaleConverterFactory.java

+21 −1
Original line number Diff line number Diff line
@@ -56,6 +56,16 @@ public class FontScaleConverterFactory { 
        // These were generated by frameworks/base/tools/fonts/font-scaling-array-generator.js and

        // manually tweaked for optimum readability.

        synchronized (LOOKUP_TABLES_WRITE_LOCK) {

            putInto(

                    sLookupTables,

                    /* scaleKey= */ 1.05f,

                    new FontScaleConverterImpl(

                            /* fromSp= */

                            new float[] {   8f,   10f,   12f,   14f,   18f,   20f,   24f,   30f,  100},

                            /* toDp=   */

                            new float[] { 8.4f, 10.5f, 12.6f, 14.8f, 18.6f, 20.6f, 24.4f,   30f,  100})

            );



            putInto(

                    sLookupTables,

                    /* scaleKey= */ 1.1f,
@@ -76,6 +86,16 @@ public class FontScaleConverterFactory { 
                            new float[] { 9.2f, 11.5f, 13.8f, 16.4f, 19.8f, 21.8f, 25.2f,   30f,  100})

            );



            putInto(

                    sLookupTables,

                    /* scaleKey= */ 1.2f,

                    new FontScaleConverterImpl(

                            /* fromSp= */

                            new float[] {   8f,   10f,   12f,   14f,   18f,   20f,   24f,   30f,  100},

                            /* toDp=   */

                            new float[] { 9.6f,   12f, 14.4f, 17.2f, 20.4f, 22.4f, 25.6f,   30f,  100})

            );



            putInto(

                    sLookupTables,

                    /* scaleKey= */ 1.3f,
@@ -117,7 +137,7 @@ public class FontScaleConverterFactory { 
            );

        }



        sMinScaleBeforeCurvesApplied = getScaleFromKey(sLookupTables.keyAt(0)) - 0.02f;

        sMinScaleBeforeCurvesApplied = getScaleFromKey(sLookupTables.keyAt(0)) - 0.01f;

        if (sMinScaleBeforeCurvesApplied <= 1.0f) {

            throw new IllegalStateException(

                    "You should only apply non-linear scaling to font scales > 1"

core/tests/coretests/src/android/content/res/FontScaleConverterFactoryTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -175,10 +175,12 @@ class FontScaleConverterFactoryTest { 
        assertThat(FontScaleConverterFactory.isNonLinearFontScalingActive(-1f)).isFalse()

        assertThat(FontScaleConverterFactory.isNonLinearFontScalingActive(0.85f)).isFalse()

        assertThat(FontScaleConverterFactory.isNonLinearFontScalingActive(1.02f)).isFalse()

        assertThat(FontScaleConverterFactory.isNonLinearFontScalingActive(1.05f)).isTrue()

        assertThat(FontScaleConverterFactory.isNonLinearFontScalingActive(1.10f)).isTrue()

        assertThat(FontScaleConverterFactory.isNonLinearFontScalingActive(1.15f)).isTrue()

        assertThat(FontScaleConverterFactory.isNonLinearFontScalingActive(1.1499999f))

                .isTrue()

        assertThat(FontScaleConverterFactory.isNonLinearFontScalingActive(1.2f)).isTrue()

        assertThat(FontScaleConverterFactory.isNonLinearFontScalingActive(1.5f)).isTrue()

        assertThat(FontScaleConverterFactory.isNonLinearFontScalingActive(2f)).isTrue()

        assertThat(FontScaleConverterFactory.isNonLinearFontScalingActive(3f)).isTrue()