diff options
| author | Bart Sears <bsears@google.com> | 2011-12-11 18:21:56 -0800 |
|---|---|---|
| committer | Bart Sears <bsears@google.com> | 2011-12-13 20:58:28 -0800 |
| commit | e60bae1d1d652347b42621d991d9ce3ba7e47770 (patch) | |
| tree | 6c1b45a34c8dcf081dbf2189cc416510f0ca16cb | |
| parent | 95ea6d6d5d56a7e9e533abe2837ed2379c4271e1 (diff) | |
| download | frameworks_base-e60bae1d1d652347b42621d991d9ce3ba7e47770.zip frameworks_base-e60bae1d1d652347b42621d991d9ce3ba7e47770.tar.gz frameworks_base-e60bae1d1d652347b42621d991d9ce3ba7e47770.tar.bz2 | |
Emoji characters for Android
Change-Id: I887dca18bb5046a8390bf96c99d983d9c434648f
| -rw-r--r-- | data/fonts/AndroidEmoji.ttf | bin | 0 -> 328104 bytes | |||
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 5 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/data/fonts/AndroidEmoji.ttf b/data/fonts/AndroidEmoji.ttf Binary files differnew file mode 100644 index 0000000..d543f75 --- /dev/null +++ b/data/fonts/AndroidEmoji.ttf diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index e23004b..47cdae7 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -71,6 +71,11 @@ </family> <family> <fileset> + <file>AndroidEmoji.ttf</file> + </fileset> + </family> + <family> + <fileset> <file>DroidSansFallback.ttf</file> </fileset> </family> diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk index 3f51eb3..9dca329 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -32,6 +32,7 @@ PRODUCT_COPY_FILES := \ frameworks/base/data/fonts/DroidSansMono.ttf:system/fonts/DroidSansMono.ttf \ frameworks/base/data/fonts/DroidSansArmenian.ttf:system/fonts/DroidSansArmenian.ttf \ frameworks/base/data/fonts/DroidSansGeorgian.ttf:system/fonts/DroidSansGeorgian.ttf \ + frameworks/base/data/fonts/AndroidEmoji.ttf:system/fonts/AndroidEmoji.ttf \ frameworks/base/data/fonts/Clockopia.ttf:system/fonts/Clockopia.ttf \ frameworks/base/data/fonts/AndroidClock.ttf:system/fonts/AndroidClock.ttf \ frameworks/base/data/fonts/AndroidClock_Highlight.ttf:system/fonts/AndroidClock_Highlight.ttf \ |