diff options
| author | Roozbeh Pournader <roozbeh@google.com> | 2014-07-09 09:33:04 -0700 |
|---|---|---|
| committer | Raph Levien <raph@google.com> | 2014-07-09 16:59:24 +0000 |
| commit | cbd098920d3f358312302f76b520a33536c0d0cb (patch) | |
| tree | 0c8a259af1c53413a42f79f4160f2a8414cd0d27 /data | |
| parent | 9b9b812218bca0fd1bdcecab956ff548d06cfbe1 (diff) | |
| download | frameworks_base-cbd098920d3f358312302f76b520a33536c0d0cb.zip frameworks_base-cbd098920d3f358312302f76b520a33536c0d0cb.tar.gz frameworks_base-cbd098920d3f358312302f76b520a33536c0d0cb.tar.bz2 | |
Remove the monochrome AndroidEmoji font.
All characters are now supported in other fonts in the fallback chain:
U+303D is supported in Noto Color Emoji, everything else is supported in
the subsettd Noto Sans Symbols.
Bug: 15777351
Change-Id: Ibf4bbffbfdddfa9e0f08ceff96c835ffeb3e555d
Diffstat (limited to 'data')
| -rw-r--r-- | data/fonts/Android.mk | 3 | ||||
| -rw-r--r-- | data/fonts/AndroidEmoji.ttf | bin | 2760 -> 0 bytes | |||
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 5 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 1 |
4 files changed, 1 insertions, 8 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 86a45c5..9f6b64c 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -137,8 +137,7 @@ font_src_files += \ RobotoCondensed-Italic.ttf \ RobotoCondensed-BoldItalic.ttf \ RobotoCondensed-Light.ttf \ - RobotoCondensed-LightItalic.ttf \ - AndroidEmoji.ttf + RobotoCondensed-LightItalic.ttf endif # !MINIMAL_FONT diff --git a/data/fonts/AndroidEmoji.ttf b/data/fonts/AndroidEmoji.ttf Binary files differdeleted file mode 100644 index 8bdc26a..0000000 --- a/data/fonts/AndroidEmoji.ttf +++ /dev/null diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index 37e9b15..a7e159a 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -264,11 +264,6 @@ </family> <family> <fileset> - <file>AndroidEmoji.ttf</file> - </fileset> - </family> - <family> - <fileset> <file>NotoColorEmoji.ttf</file> </fileset> </family> diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 70fc6a2..2ff2010 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -39,7 +39,6 @@ PRODUCT_PACKAGES := \ RobotoCondensed-Light.ttf \ RobotoCondensed-LightItalic.ttf \ DroidSansMono.ttf \ - AndroidEmoji.ttf \ Clockopia.ttf \ AndroidClock.ttf \ AndroidClock_Highlight.ttf \ |