From 09e9a3b39c6927f25deb4400ba91eeaf1a8dadfe Mon Sep 17 00:00:00 2001
From: Edgar Wang <edgarwang@google.com>
Date: Fri, 24 Dec 2021 05:33:15 +0000
Subject: [PATCH] Make TextAppearance.DeviceDefault.Headline public.

Bug: 211941921
Bug: 195969565

Change-Id: I460e5ba27e664cace1560c0e527c99f4aa1d81da
Test: rebuild
---
 core/api/current.txt                           | 1 +
 core/res/res/values/public.xml                 | 1 +
 core/res/res/values/styles_device_defaults.xml | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 98d3a91c99446..8d7cd7c75d176 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -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
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index bc127d9c1d063..1edaaa5d70af2 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -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">
diff --git a/core/res/res/values/styles_device_defaults.xml b/core/res/res/values/styles_device_defaults.xml
index d8111ea5d8ba8..dcfca8497ec68 100644
--- a/core/res/res/values/styles_device_defaults.xml
+++ b/core/res/res/values/styles_device_defaults.xml
@@ -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>