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

Commit c0c36639 authored by Adam Lesinski's avatar Adam Lesinski
Browse files

Add font type to AAPT2 

Test: make libaapt2_tests AaptTestAppOne
Change-Id: I8fbf01675a218cc3c0b59598b6b1ec173851e946
parent 9212fc74

api/current.txt

+3 −0
Original line number Diff line number Diff line
@@ -577,8 +577,11 @@ package android { 
    field public static final int focusable = 16842970; // 0x10100da

    field public static final int focusableInTouchMode = 16842971; // 0x10100db

    field public static final deprecated int focusedMonthDateColor = 16843587; // 0x1010343

    field public static final int font = 16844082; // 0x1010532

    field public static final int fontFamily = 16843692; // 0x10103ac

    field public static final int fontFeatureSettings = 16843959; // 0x10104b7

    field public static final int fontStyle = 16844081; // 0x1010531

    field public static final int fontWeight = 16844083; // 0x1010533

    field public static final int footerDividersEnabled = 16843311; // 0x101022f

    field public static final int forceHasOverlappingRendering = 16844065; // 0x1010521

    field public static final int foreground = 16843017; // 0x1010109

api/system-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -683,8 +683,11 @@ package android { 
    field public static final int focusable = 16842970; // 0x10100da

    field public static final int focusableInTouchMode = 16842971; // 0x10100db

    field public static final deprecated int focusedMonthDateColor = 16843587; // 0x1010343

    field public static final int font = 16844082; // 0x1010532

    field public static final int fontFamily = 16843692; // 0x10103ac

    field public static final int fontFeatureSettings = 16843959; // 0x10104b7

    field public static final int fontStyle = 16844081; // 0x1010531

    field public static final int fontWeight = 16844083; // 0x1010533

    field public static final int footerDividersEnabled = 16843311; // 0x101022f

    field public static final int forceHasOverlappingRendering = 16844065; // 0x1010521

    field public static final int foreground = 16843017; // 0x1010109

api/test-current.txt

+3 −0
Original line number Diff line number Diff line
@@ -577,8 +577,11 @@ package android { 
    field public static final int focusable = 16842970; // 0x10100da

    field public static final int focusableInTouchMode = 16842971; // 0x10100db

    field public static final deprecated int focusedMonthDateColor = 16843587; // 0x1010343

    field public static final int font = 16844082; // 0x1010532

    field public static final int fontFamily = 16843692; // 0x10103ac

    field public static final int fontFeatureSettings = 16843959; // 0x10104b7

    field public static final int fontStyle = 16844081; // 0x1010531

    field public static final int fontWeight = 16844083; // 0x1010533

    field public static final int footerDividersEnabled = 16843311; // 0x101022f

    field public static final int forceHasOverlappingRendering = 16844065; // 0x1010521

    field public static final int foreground = 16843017; // 0x1010109

core/res/res/values/attrs.xml

+11 −0
Original line number Diff line number Diff line
@@ -8335,4 +8335,15 @@ i 
    <declare-styleable name="ShortcutCategories">

        <attr name="name" />

    </declare-styleable>



    <!-- Attributes that are read when parsing a <font> tag, which is a child of

         <font-family>. -->

    <declare-styleable name="FontFamilyFont">

        <attr name="fontStyle">

            <enum name="normal" value="0" />

            <enum name="italic" value="1" />

        </attr>

        <attr name="font" format="reference" />

        <attr name="fontWeight" format="integer" />

    </declare-styleable>

</resources>

core/res/res/values/public.xml

+3 −0
Original line number Diff line number Diff line
@@ -2756,6 +2756,9 @@ 
    <eat-comment />



    <public-group type="attr" first-id="0x01010531">

        <public name="fontStyle" />

        <public name="font" />

        <public name="fontWeight" />

    </public-group>



    <public-group type="style" first-id="0x010302e0">