diff options
| author | Raph Levien <raph@google.com> | 2014-12-05 07:27:31 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-05 07:27:33 +0000 |
| commit | c8640fca7862fee5e156fa634c1cdf7853115595 (patch) | |
| tree | 02c5a6f12a23e464ac756b3ba2c2cd76358bdb14 | |
| parent | 9e094efa93e9c95212c0edfcd1b0bb0380f7af9a (diff) | |
| parent | 7f45f6dd0ce74665481bf06124b9653b8ff81e98 (diff) | |
| download | frameworks_base-c8640fca7862fee5e156fa634c1cdf7853115595.zip frameworks_base-c8640fca7862fee5e156fa634c1cdf7853115595.tar.gz frameworks_base-c8640fca7862fee5e156fa634c1cdf7853115595.tar.bz2 | |
Merge "Add 8 more scripts to the font fallback chain." into lmp-mr1-dev
| -rw-r--r-- | data/fonts/fallback_fonts.xml | 41 | ||||
| -rw-r--r-- | data/fonts/fonts.xml | 25 |
2 files changed, 66 insertions, 0 deletions
diff --git a/data/fonts/fallback_fonts.xml b/data/fonts/fallback_fonts.xml index 0244891..f94fe66 100644 --- a/data/fonts/fallback_fonts.xml +++ b/data/fonts/fallback_fonts.xml @@ -229,6 +229,12 @@ </family> <family> <fileset> + <file>NotoSansCham-Regular.ttf</file> + <file>NotoSansCham-Bold.ttf</file> + </fileset> + </family> + <family> + <fileset> <file>NotoSansBalinese-Regular.ttf</file> </fileset> </family> @@ -259,6 +265,16 @@ </family> <family> <fileset> + <file>NotoSansCoptic-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file>NotoSansGlagolitic-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> <file>NotoSansHanunoo-Regular.ttf</file> </fileset> </family> @@ -269,6 +285,11 @@ </family> <family> <fileset> + <file>NotoSansKayahLi-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> <file>NotoSansLepcha-Regular.ttf</file> </fileset> </family> @@ -314,6 +335,26 @@ </family> <family> <fileset> + <file>NotoSansTaiLe-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file>NotoSansTaiTham-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file>NotoSansTaiViet-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> + <file>NotoSansTifinagh-Regular.ttf</file> + </fileset> + </family> + <family> + <fileset> <file>NotoSansYi-Regular.ttf</file> </fileset> </family> diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml index a62e972..02bf877 100644 --- a/data/fonts/fonts.xml +++ b/data/fonts/fonts.xml @@ -224,6 +224,10 @@ <font weight="700" style="normal">NotoSansThaana-Bold.ttf</font> </family> <family> + <font weight="400" style="normal">NotoSansCham-Regular.ttf</font> + <font weight="700" style="normal">NotoSansCham-Bold.ttf</font> + </family> + <family> <font weight="400" style="normal">NotoSansBalinese-Regular.ttf</font> </family> <family> @@ -242,12 +246,21 @@ <font weight="400" style="normal">NotoSansCherokee-Regular.ttf</font> </family> <family> + <font weight="400" style="normal">NotoSansCoptic-Regular.ttf</font> + </family> + <family> + <font weight="400" style="normal">NotoSansGlagolitic-Regular.ttf</font> + </family> + <family> <font weight="400" style="normal">NotoSansHanunoo-Regular.ttf</font> </family> <family> <font weight="400" style="normal">NotoSansJavanese-Regular.ttf</font> </family> <family> + <font weight="400" style="normal">NotoSansKayahLi-Regular.ttf</font> + </family> + <family> <font weight="400" style="normal">NotoSansLepcha-Regular.ttf</font> </family> <family> @@ -275,6 +288,18 @@ <font weight="400" style="normal">NotoSansTagbanwa-Regular.ttf</font> </family> <family> + <font weight="400" style="normal">NotoSansTaiLe-Regular.ttf</font> + </family> + <family> + <font weight="400" style="normal">NotoSansTaiTham-Regular.ttf</font> + </family> + <family> + <font weight="400" style="normal">NotoSansTaiViet-Regular.ttf</font> + </family> + <family> + <font weight="400" style="normal">NotoSansTifinagh-Regular.ttf</font> + </family> + <family> <font weight="400" style="normal">NotoSansYi-Regular.ttf</font> </family> <family> |