Merge "Add config_headlineFontFamily."

This commit is contained in:
Andrew Sapperstein
2017-06-07 02:21:53 +00:00
committed by Android (Google) Code Review
2 changed files with 4 additions and 1 deletions

View File

@@ -2961,4 +2961,7 @@
<!-- Default number of days to retain for the automatic storage manager. -->
<integer translatable="false" name="config_storageManagerDaystoRetainDefault">90</integer>
<!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
<string name="config_headlineFontFamily" translatable="false"></string>
</resources>

View File

@@ -3042,7 +3042,7 @@
<java-symbol type="integer" name="config_inCallNotificationVolumeRelative" />
<java-symbol type="bool" name="config_dozeAlwaysOnDisplayAvailable" />
<java-symbol type="integer" name="config_storageManagerDaystoRetainDefault" />
<java-symbol type="string" name="config_headlineFontFamily" />
<java-symbol type="drawable" name="stat_sys_vitals" />
</resources>