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

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

Merge "Revert "Implement family fallback." DO NOT MERGE" into oc-mr1-dev

parents a18e39e6 065c59be

core/java/android/text/FontConfig.java

+1 −7
Original line number Diff line number Diff line
@@ -64,19 +64,17 @@ public final class FontConfig { 
        private final int mWeight;

        private final boolean mIsItalic;

        private Uri mUri;

        private final String mFallbackFor;



        /**

         * @hide

         */

        public Font(@NonNull String fontName, int ttcIndex, @NonNull FontVariationAxis[] axes,

                int weight, boolean isItalic, String fallbackFor) {

                int weight, boolean isItalic) {

            mFontName = fontName;

            mTtcIndex = ttcIndex;

            mAxes = axes;

            mWeight = weight;

            mIsItalic = isItalic;

            mFallbackFor = fallbackFor;

        }



        /**
@@ -127,10 +125,6 @@ public final class FontConfig { 
        public void setUri(@NonNull Uri uri) {

            mUri = uri;

        }



        public String getFallbackFor() {

            return mFallbackFor;

        }

    }



    /**

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

deleted100644 → 0
−1.74 KiB

File deleted.

View file

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

deleted100644 → 0
+0 −187
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.0">



  <GlyphOrder>

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

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

    <GlyphID id="2" name="3em"/>

  </GlyphOrder>



  <head>

    <tableVersion value="1.0"/>

    <fontRevision value="1.0"/>

    <checkSumAdjustment value="0x640cdb2f"/>

    <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="1.0"/>

    <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>

    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'

         will be recalculated by the compiler -->

    <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"/>

    <usFirstCharIndex value="32"/>

    <usLastCharIndex value="122"/>

    <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="1em" width="1000" lsb="93"/>

    <mtx name="3em" width="3000" lsb="93"/>

  </hmtx>



  <cmap>

    <tableVersion version="0"/>

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

      <map code="0x0061" name="3em" />

      <map code="0x0062" name="1em" />

      <map code="0x0063" name="1em" />

      <map code="0x0064" name="1em" />

      <map code="0x0065" name="1em" />

    </cmap_format_4>

  </cmap>



  <loca>

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

  </loca>



  <glyf>

    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0" />

    <TTGlyph name="1em" xMin="0" yMin="0" xMax="0" yMax="0" />

    <TTGlyph name="3em" xMin="0" yMin="0" xMax="0" yMax="0" />

  </glyf>



  <name>

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

      Copyright (C) 2017 The Android Open Source Project

    </namerecord>

    <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>

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

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

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

      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.

    </namerecord>

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

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

    </namerecord>

  </name>



  <post>

    <formatType value="3.0"/>

    <italicAngle value="0.0"/>

    <underlinePosition value="-75"/>

    <underlineThickness value="50"/>

    <isFixedPitch value="0"/>

    <minMemType42 value="0"/>

    <maxMemType42 value="0"/>

    <minMemType1 value="0"/>

    <maxMemType1 value="0"/>

  </post>



</ttFont>

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

deleted100644 → 0
−1.74 KiB

File deleted.

View file

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

deleted100644 → 0
+0 −184
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.0">



  <GlyphOrder>

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

    <GlyphID id="1" name="2em"/>

  </GlyphOrder>



  <head>

    <tableVersion value="1.0"/>

    <fontRevision value="1.0"/>

    <checkSumAdjustment value="0x640cdb2f"/>

    <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="1.0"/>

    <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>

    <!-- The fields 'usFirstCharIndex' and 'usLastCharIndex'

         will be recalculated by the compiler -->

    <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"/>

    <usFirstCharIndex value="32"/>

    <usLastCharIndex value="122"/>

    <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="2em" width="1000" lsb="93"/>

  </hmtx>



  <cmap>

    <tableVersion version="0"/>

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

      <map code="0x0061" name="2em" />

      <map code="0x0062" name="2em" />

      <map code="0x0063" name="2em" />

      <map code="0x0064" name="2em" />

      <map code="0x0065" name="2em" />

    </cmap_format_4>

  </cmap>



  <loca>

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

  </loca>



  <glyf>

    <TTGlyph name=".notdef" xMin="0" yMin="0" xMax="0" yMax="0" />

    <TTGlyph name="2em" xMin="0" yMin="0" xMax="0" yMax="0" />

  </glyf>



  <name>

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

      Copyright (C) 2017 The Android Open Source Project

    </namerecord>

    <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>

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

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

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

      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.

    </namerecord>

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

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

    </namerecord>

  </name>



  <post>

    <formatType value="3.0"/>

    <italicAngle value="0.0"/>

    <underlinePosition value="-75"/>

    <underlineThickness value="50"/>

    <isFixedPitch value="0"/>

    <minMemType42 value="0"/>

    <maxMemType42 value="0"/>

    <minMemType1 value="0"/>

    <maxMemType1 value="0"/>

  </post>



</ttFont>