diff options
| author | Victoria Lease <violets@google.com> | 2013-09-18 14:51:55 -0700 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2013-09-18 15:30:32 -0700 |
| commit | 4ce0931ffd78c0cfe1de37c291f96b5275ae53a4 (patch) | |
| tree | af626a25ef92a36cc5f278f7b17e2fa7672397f9 /data/fonts | |
| parent | c255a7113a6a6b058f1b3b5b128fba1d24bbd3d9 (diff) | |
| download | frameworks_base-4ce0931ffd78c0cfe1de37c291f96b5275ae53a4.zip frameworks_base-4ce0931ffd78c0cfe1de37c291f96b5275ae53a4.tar.gz frameworks_base-4ce0931ffd78c0cfe1de37c291f96b5275ae53a4.tar.bz2 | |
restore coverage lost in NotoColorEmoji transition
The following codepoints were previously provided by AndroidEmoji,
but are no longer present in our fallback chain. This commit restores
them by resurrecting a subset version of AndroidEmoji.ttf:
U+25AB WHITE SMALL SQUARE
U+25FB WHITE MEDIUM SQUARE
U+25FC BLACK MEDIUM SQUARE
U+25FD WHITE MEDIUM SMALL SQUARE
U+25FE BLACK MEDIUM SMALL SQUARE
U+2600 BLACK SUN WITH RAYS
U+26AA MEDIUM WHITE CIRCLE
U+26AB MEDIUM BLACK CIRCLE
U+2757 HEAVY EXCLAMATION MARK SYMBOL
U+2934 ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS
U+2935 ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS
U+2B05 LEFTWARDS BLACK ARROW
U+2B06 UPWARDS BLACK ARROW
U+2B07 DOWNWARDS BLACK ARROW
U+2B1B BLACK LARGE SQUARE
U+2B1C WHITE LARGE SQUARE
U+2B50 WHITE MEDIUM STAR
U+2B55 HEAVY LARGE CIRCLE
U+303D PART ALTERNATION MARK
These characters see regular use in kaomoji constructions (and
elsewhere), and it really wouldn't do to lose them.
Bug: 10144988
Change-Id: I72b541aad01bc5ccac829be44ed259c461724142
Diffstat (limited to 'data/fonts')
| -rw-r--r-- | data/fonts/Android.mk | 3 | ||||
| -rw-r--r-- | data/fonts/AndroidEmoji.ttf | bin | 0 -> 2748 bytes | |||
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 5 | ||||
| -rw-r--r-- | data/fonts/fonts.mk | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk index 2846e61..0d9a386 100644 --- a/data/fonts/Android.mk +++ b/data/fonts/Android.mk @@ -138,7 +138,8 @@ font_src_files += \ DroidSansHebrew-Regular.ttf \ DroidSansHebrew-Bold.ttf \ DroidSansArmenian.ttf \ - DroidSansGeorgian.ttf + DroidSansGeorgian.ttf \ + AndroidEmoji.ttf endif # !MINIMAL_FONT diff --git a/data/fonts/AndroidEmoji.ttf b/data/fonts/AndroidEmoji.ttf Binary files differnew file mode 100644 index 0000000..98f72e7 --- /dev/null +++ b/data/fonts/AndroidEmoji.ttf diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index 69db6aa..ede7ef4 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -186,6 +186,11 @@ </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 a677c4f..05cca13 100644 --- a/data/fonts/fonts.mk +++ b/data/fonts/fonts.mk @@ -43,6 +43,7 @@ PRODUCT_PACKAGES := \ DroidSansMono.ttf \ DroidSansArmenian.ttf \ DroidSansGeorgian.ttf \ + AndroidEmoji.ttf \ Clockopia.ttf \ AndroidClock.ttf \ AndroidClock_Highlight.ttf \ |