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

Commit ca8a04a3 authored by Roozbeh Pournader's avatar Roozbeh Pournader
Browse files

Get underline position and thickness from the font 

Previously, font underline position and thickness were fixed in Android.
Although a custom font may have specified a different value, such a value
would never be used. Now we use the values from the font if they are
provided and fall back to the old default values only if needed.

Bug: 62353930

Test: adb shell am instrument -w -e package android.graphics com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: adb shell am instrument -w -e package android.text com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Test: cts-tradefed run cts-dev --module CtsTextTestCases
Test: Manual
Change-Id: I6bf21000dd69a2780c894b231638bc0c122e41f4
parent eed27590

core/java/android/text/TextLine.java

+3 −1
Original line number Diff line number Diff line
@@ -827,7 +827,9 @@ class TextLine { 
                                underlineXLeft, underlineXRight, y);

                    }

                    if (info.isUnderlineText) {

                        drawUnderline(wp, c, wp.getColor(), ((Paint) wp).getUnderlineThickness(),

                        final float thickness =

                                Math.max(((Paint) wp).getUnderlineThickness(), 1.0f);

                        drawUnderline(wp, c, wp.getColor(), thickness,

                                underlineXLeft, underlineXRight, y);

                    }

                }

core/jni/android/graphics/Paint.cpp

+26 −0
Original line number Diff line number Diff line
@@ -961,6 +961,30 @@ namespace PaintGlue { 
        return SkScalarToFloat(metrics.fDescent);

    }



    static jfloat getUnderlinePosition(jlong paintHandle, jlong typefaceHandle) {

        Paint::FontMetrics metrics;

        getMetricsInternal(paintHandle, typefaceHandle, &metrics);

        SkScalar position;

        if (metrics.hasUnderlinePosition(&position)) {

            return SkScalarToFloat(position);

        } else {

            const SkScalar textSize = reinterpret_cast<Paint*>(paintHandle)->getTextSize();

            return SkScalarToFloat(Paint::kStdUnderline_Top * textSize);

        }

    }



    static jfloat getUnderlineThickness(jlong paintHandle, jlong typefaceHandle) {

        Paint::FontMetrics metrics;

        getMetricsInternal(paintHandle, typefaceHandle, &metrics);

        SkScalar thickness;

        if (metrics.hasUnderlineThickness(&thickness)) {

            return SkScalarToFloat(thickness);

        } else {

            const SkScalar textSize = reinterpret_cast<Paint*>(paintHandle)->getTextSize();

            return SkScalarToFloat(Paint::kStdUnderline_Thickness * textSize);

        }

    }



    static void setShadowLayer(jlong paintHandle, jfloat radius,

                               jfloat dx, jfloat dy, jint color) {

        Paint* paint = reinterpret_cast<Paint*>(paintHandle);
@@ -1072,6 +1096,8 @@ static const JNINativeMethod methods[] = { 
    {"nSetHyphenEdit", "(JI)V", (void*) PaintGlue::setHyphenEdit},

    {"nAscent","(JJ)F", (void*) PaintGlue::ascent},

    {"nDescent","(JJ)F", (void*) PaintGlue::descent},

    {"nGetUnderlinePosition","(JJ)F", (void*) PaintGlue::getUnderlinePosition},

    {"nGetUnderlineThickness","(JJ)F", (void*) PaintGlue::getUnderlineThickness},

    {"nSetShadowLayer", "(JFFFI)V", (void*)PaintGlue::setShadowLayer},

    {"nHasShadowLayer", "(J)Z", (void*)PaintGlue::hasShadowLayer}

};

core/tests/coretests/assets/fonts/underlineTestFont.ttf

0 → 100644
+612 B

File added.

No diff preview for this file type.

View file

core/tests/coretests/assets/fonts/underlineTestFont.ttx

0 → 100644
+163 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!-- Copyright (C) 2017 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<ttFont sfntVersion="\x00\x01\x00\x00" ttLibVersion="3.9">



  <GlyphOrder>

    <GlyphID id="0" name=".notdef"/>

    <GlyphID id="1" name="a"/>

  </GlyphOrder>



  <head>

    <tableVersion value="1.0"/>

    <fontRevision value="1.0"/>

    <checkSumAdjustment value="0"/>

    <magicNumber value="0x5f0f3cf5"/>

    <flags value="00000000 00000011"/>

    <unitsPerEm value="1000"/>

    <created value="Fri Mar 17 07:26:00 2017"/>

    <macStyle value="00000000 00000000"/>

    <lowestRecPPEM value="7"/>

    <fontDirectionHint value="2"/>

    <glyphDataFormat value="0"/>

  </head>



  <hhea>

    <tableVersion value="0x00010000"/>

    <ascent value="1000"/>

    <descent value="-200"/>

    <lineGap value="0"/>

    <caretSlopeRise value="1"/>

    <caretSlopeRun value="0"/>

    <caretOffset value="0"/>

    <reserved0 value="0"/>

    <reserved1 value="0"/>

    <reserved2 value="0"/>

    <reserved3 value="0"/>

    <metricDataFormat value="0"/>

  </hhea>



  <maxp>

    <tableVersion value="0x10000"/>

    <maxZones value="0"/>

    <maxTwilightPoints value="0"/>

    <maxStorage value="0"/>

    <maxFunctionDefs value="0"/>

    <maxInstructionDefs value="0"/>

    <maxStackElements value="0"/>

    <maxSizeOfInstructions value="0"/>

    <maxComponentElements value="0"/>

  </maxp>



  <OS_2>

    <version value="3"/>

    <xAvgCharWidth value="594"/>

    <usWeightClass value="400"/>

    <usWidthClass value="5"/>

    <fsType value="00000000 00001000"/>

    <ySubscriptXSize value="650"/>

    <ySubscriptYSize value="600"/>

    <ySubscriptXOffset value="0"/>

    <ySubscriptYOffset value="75"/>

    <ySuperscriptXSize value="650"/>

    <ySuperscriptYSize value="600"/>

    <ySuperscriptXOffset value="0"/>

    <ySuperscriptYOffset value="350"/>

    <yStrikeoutSize value="50"/>

    <yStrikeoutPosition value="300"/>

    <sFamilyClass value="0"/>

    <panose>

      <bFamilyType value="0"/>

      <bSerifStyle value="0"/>

      <bWeight value="5"/>

      <bProportion value="0"/>

      <bContrast value="0"/>

      <bStrokeVariation value="0"/>

      <bArmStyle value="0"/>

      <bLetterForm value="0"/>

      <bMidline value="0"/>

      <bXHeight value="0"/>

    </panose>

    <ulUnicodeRange1 value="00000000 00000000 00000000 00000001"/>

    <ulUnicodeRange2 value="00000000 00000000 00000000 00000000"/>

    <ulUnicodeRange3 value="00000000 00000000 00000000 00000000"/>

    <ulUnicodeRange4 value="00000000 00000000 00000000 00000000"/>

    <achVendID value="UKWN"/>

    <fsSelection value="00000000 01000000"/>

    <sTypoAscender value="800"/>

    <sTypoDescender value="-200"/>

    <sTypoLineGap value="200"/>

    <usWinAscent value="1000"/>

    <usWinDescent value="200"/>

    <ulCodePageRange1 value="00000000 00000000 00000000 00000001"/>

    <ulCodePageRange2 value="00000000 00000000 00000000 00000000"/>

    <sxHeight value="500"/>

    <sCapHeight value="700"/>

    <usDefaultChar value="0"/>

    <usBreakChar value="32"/>

    <usMaxContext value="0"/>

  </OS_2>



  <hmtx>

    <mtx name=".notdef" width="500" lsb="93"/>

    <mtx name="a" width="500" lsb="93"/>

  </hmtx>



  <cmap>

    <tableVersion version="0"/>

    <cmap_format_4 platformID="3" platEncID="10" language="0">

      <map code="0x61" name="a"/><!-- LATIN SMALL LETTER A -->

    </cmap_format_4>

  </cmap>



  <loca>

    <!-- The 'loca' table will be calculated by the compiler -->

  </loca>



  <glyf>

    <TTGlyph name=".notdef"/><!-- contains no outline data -->



    <TTGlyph name="a"/><!-- contains no outline data -->



  </glyf>



  <name>

    <namerecord nameID="1" platformID="3" platEncID="1" langID="0x409">

      Sample Font

    </namerecord>

    <namerecord nameID="2" platformID="3" platEncID="1" langID="0x409">

      Regular

    </namerecord>

    <namerecord nameID="4" platformID="3" platEncID="1" langID="0x409">

      Sample Font

    </namerecord>

    <namerecord nameID="6" platformID="3" platEncID="1" langID="0x409">

      SampleFont-Regular

    </namerecord>

  </name>



  <post>

    <formatType value="3.0"/>

    <italicAngle value="0.0"/>

    <underlinePosition value="-200"/>

    <underlineThickness value="300"/>

    <isFixedPitch value="0"/>

    <minMemType42 value="0"/>

    <maxMemType42 value="0"/>

    <minMemType1 value="0"/>

    <maxMemType1 value="0"/>

  </post>



</ttFont>

core/tests/coretests/src/android/graphics/PaintTest.java

+29 −0
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package android.graphics;



import static org.junit.Assert.assertNotEquals;



import android.graphics.Paint;

import android.test.InstrumentationTestCase;

import android.test.suitebuilder.annotation.SmallTest;
@@ -365,4 +367,31 @@ public class PaintTest extends InstrumentationTestCase { 
        p.setWordSpacing(-2.0f);

        assertEquals(-2.0f, p.getWordSpacing());

    }



    public void testGetUnderlinePositionAndThickness() {

        final Typeface fontTypeface = Typeface.createFromAsset(

                getInstrumentation().getContext().getAssets(), "fonts/underlineTestFont.ttf");

        final Paint p = new Paint();

        final int textSize = 100;

        p.setTextSize(textSize);



        final float origPosition = p.getUnderlinePosition();

        final float origThickness = p.getUnderlineThickness();



        p.setTypeface(fontTypeface);

        assertNotEquals(origPosition, p.getUnderlinePosition());

        assertNotEquals(origThickness, p.getUnderlineThickness());



        //    -200 (underlinePosition in 'post' table, negative means below the baseline)

        //    ÷ 1000 (unitsPerEm in 'head' table)

        //    × 100 (text size)

        //    × -1 (negated, since we consider below the baseline positive)

        //    = 20

        assertEquals(20.0f, p.getUnderlinePosition(), 0.5f);

        //    300 (underlineThickness in 'post' table)

        //    ÷ 1000 (unitsPerEm in 'head' table)

        //    × 100 (text size)

        //    = 30

        assertEquals(30.0f, p.getUnderlineThickness(), 0.5f);

    }

}