diff options
| author | 2017-06-07 02:21:53 +0000 | |
|---|---|---|
| committer | 2017-06-07 02:21:57 +0000 | |
| commit | b5fae92266ce1bec9cd6b77dc6aba73b29e519a6 (patch) | |
| tree | 455525f4e5d13b80e5a72351a1121517728c5d1b | |
| parent | 09c954369257f88e0809e9358f0972395a19a0c3 (diff) | |
| parent | 2876ee981504cf53d19a04ec88b895abfa027843 (diff) | |
Merge "Add config_headlineFontFamily."
| -rw-r--r-- | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/symbols.xml | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 560907d8e659..8e7b81740728 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -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> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index 2f1df6fb9f06..5ffa48cb87db 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -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> |