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

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

Merge "Make TextAppearance.DeviceDefault.Headline public."

parents d9bdab73 09e9a3b3

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -2258,6 +2258,7 @@ package android { 
    field public static final int TextAppearance = 16973886; // 0x103003e

    field public static final int TextAppearance_DeviceDefault = 16974253; // 0x10301ad

    field public static final int TextAppearance_DeviceDefault_DialogWindowTitle = 16974264; // 0x10301b8

    field public static final int TextAppearance_DeviceDefault_Headline;

    field public static final int TextAppearance_DeviceDefault_Inverse = 16974254; // 0x10301ae

    field public static final int TextAppearance_DeviceDefault_Large = 16974255; // 0x10301af

    field public static final int TextAppearance_DeviceDefault_Large_Inverse = 16974256; // 0x10301b0

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -3263,6 +3263,7 @@ 
  </staging-public-group>



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

    <public name="TextAppearance.DeviceDefault.Headline" />

  </staging-public-group>



  <staging-public-group type="string" first-id="0x01dc0000">

core/res/res/values/styles_device_defaults.xml

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ easier. 
        <item name="fontFamily">@string/config_bodyFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Headline" parent="TextAppearance.Material.Headline">

        <item name="fontFamily">@string/config_bodyFontFamily</item>

        <item name="fontFamily">@string/config_headlineFontFamily</item>

    </style>

    <style name="TextAppearance.DeviceDefault.Display1" parent="TextAppearance.Material.Display1">

        <item name="fontFamily">@string/config_bodyFontFamily</item>