summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2023-03-15 03:59:11 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-03-15 03:59:11 +0000
commitfc84e7e3023e94e05620f48abafb6fd37916c4a3 (patch)
tree419863e2d268d1d87a1104b75f9e074ff2235310
parent7606d5e27d73579a758f23ef9da753cac057f26c (diff)
parente6f3688104f34e01cd26add00133cab823aa0686 (diff)
Merge "Change DancingScript to VF in fonts.xml" am: a3458cb1a3 am: e6f3688104
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2483796 Change-Id: I6a1b7e53f927da6587df38cb3d3396558287c801 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--data/fonts/fonts.xml9
1 files changed, 6 insertions, 3 deletions
diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index f8c015f28a50..c877e8991d9e 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -251,9 +251,12 @@
</family>
<family name="cursive">
- <font weight="400" style="normal" postScriptName="DancingScript">DancingScript-Regular.ttf
- </font>
- <font weight="700" style="normal">DancingScript-Bold.ttf</font>
+ <font weight="400" style="normal">DancingScript-Regular.ttf
+ <axis tag="wght" stylevalue="400" />
+ </font>
+ <font weight="700" style="normal">DancingScript-Regular.ttf
+ <axis tag="wght" stylevalue="700" />
+ </font>
</family>
<family name="sans-serif-smallcaps">