diff options
| author | Victoria Lease <violets@google.com> | 2013-09-13 14:11:58 -0700 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2013-09-13 14:11:58 -0700 |
| commit | 54769862ffe7e985d3016d67045a5da9a196e08c (patch) | |
| tree | 7cb1fac39636f4ccdbee697c1440a57d3e39a9c5 /data/fonts | |
| parent | b25cfdf1ece9163292e2b4c86910fe07b14c0afa (diff) | |
| download | frameworks_base-54769862ffe7e985d3016d67045a5da9a196e08c.zip frameworks_base-54769862ffe7e985d3016d67045a5da9a196e08c.tar.gz frameworks_base-54769862ffe7e985d3016d67045a5da9a196e08c.tar.bz2 | |
NotoColorEmoji.ttf is the new AndroidEmoji.ttf
Bug: 10144988
Change-Id: I04ebb86e283b752c43597b5f908f5c28f7806ee1
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/Android.mk | 3 | ||||
| -rw-r--r-- | data/fonts/AndroidEmoji.ttf | bin | 3502396 -> 0 bytes | |||
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 2 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 1 |
4 files changed, 2 insertions, 4 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 0d9a386..2846e61 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -138,8 +138,7 @@ font_src_files += \ DroidSansHebrew-Regular.ttf \ DroidSansHebrew-Bold.ttf \ DroidSansArmenian.ttf \ - DroidSansGeorgian.ttf \ - AndroidEmoji.ttf + DroidSansGeorgian.ttf endif # !MINIMAL_FONT diff --git a/data/fonts/AndroidEmoji.ttf b/data/fonts/AndroidEmoji.ttf Binary files differdeleted file mode 100644 index 569cbab..0000000 --- a/data/fonts/AndroidEmoji.ttf +++ /dev/null diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index 1198aba..69db6aa 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -186,7 +186,7 @@ </family> <family> <fileset> - <file>AndroidEmoji.ttf</file> + <file>NotoColorEmoji.ttf</file> </fileset> </family> <family> diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 05cca13..a677c4f 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -43,7 +43,6 @@ PRODUCT_PACKAGES := \ DroidSansMono.ttf \ DroidSansArmenian.ttf \ DroidSansGeorgian.ttf \ - AndroidEmoji.ttf \ Clockopia.ttf \ AndroidClock.ttf \ AndroidClock_Highlight.ttf \ |