summaryrefslogtreecommitdiffstats
path: root/data/fonts
diff options
context:
space:
mode:
authorJustin Koh <justinkoh@google.com>2014-03-25 21:13:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-25 21:13:53 +0000
commitc635ef999bae6d48654a9a6b442b6d5d42ff38dd (patch)
tree638d7e4a0d4d6df40479a02b1730996a6a600bb0 /data/fonts
parent917a83da70d7007abfb3edd85b07a1f8a058af9b (diff)
parentec5b6e8726a215ff912bbbf872b8bdf600a74e1e (diff)
downloadframeworks_base-c635ef999bae6d48654a9a6b442b6d5d42ff38dd.zip
frameworks_base-c635ef999bae6d48654a9a6b442b6d5d42ff38dd.tar.gz
frameworks_base-c635ef999bae6d48654a9a6b442b6d5d42ff38dd.tar.bz2
am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev
* commit 'ec5b6e8726a215ff912bbbf872b8bdf600a74e1e': Add RobotoCondensed-Light to build.
Diffstat (limited to 'data/fonts')
-rw-r--r--data/fonts/Android.mk2
-rw-r--r--data/fonts/RobotoCondensed-Light.ttfbin0 -> 160800 bytes
-rwxr-xr-xdata/fonts/RobotoCondensed-LightItalic.ttfbin0 -> 164432 bytes
-rw-r--r--data/fonts/fonts.mk2
-rw-r--r--data/fonts/system_fonts.xml11
5 files changed, 15 insertions, 0 deletions
diff --git a/data/fonts/Android.mk b/data/fonts/Android.mk
index 0d9a386..97c1b33 100644
--- a/data/fonts/Android.mk
+++ b/data/fonts/Android.mk
@@ -133,6 +133,8 @@ font_src_files += \
RobotoCondensed-Bold.ttf \
RobotoCondensed-Italic.ttf \
RobotoCondensed-BoldItalic.ttf \
+ RobotoCondensed-Light.ttf \
+ RobotoCondensed-LightItalic.ttf \
DroidNaskh-Regular.ttf \
DroidNaskhUI-Regular.ttf \
DroidSansHebrew-Regular.ttf \
diff --git a/data/fonts/RobotoCondensed-Light.ttf b/data/fonts/RobotoCondensed-Light.ttf
new file mode 100644
index 0000000..41d212a
--- /dev/null
+++ b/data/fonts/RobotoCondensed-Light.ttf
Binary files differ
diff --git a/data/fonts/RobotoCondensed-LightItalic.ttf b/data/fonts/RobotoCondensed-LightItalic.ttf
new file mode 100755
index 0000000..dd54971
--- /dev/null
+++ b/data/fonts/RobotoCondensed-LightItalic.ttf
Binary files differ
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index 05cca13..293ecc8 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -32,6 +32,8 @@ PRODUCT_PACKAGES := \
RobotoCondensed-Bold.ttf \
RobotoCondensed-Italic.ttf \
RobotoCondensed-BoldItalic.ttf \
+ RobotoCondensed-Light.ttf \
+ RobotoCondensed-LightItalic.ttf \
DroidNaskh-Regular.ttf \
DroidNaskhUI-Regular.ttf \
DroidSansHebrew-Regular.ttf \
diff --git a/data/fonts/system_fonts.xml b/data/fonts/system_fonts.xml
index 549f061b..a8d23ee 100644
--- a/data/fonts/system_fonts.xml
+++ b/data/fonts/system_fonts.xml
@@ -65,6 +65,17 @@
<file>RobotoCondensed-BoldItalic.ttf</file>
</fileset>
</family>
+
+ <family>
+ <nameset>
+ <name>sans-serif-condensed-light</name>
+ </nameset>
+ <fileset>
+ <file>RobotoCondensed-Light.ttf</file>
+ <file>RobotoCondensed-LightItalic.ttf</file>
+ </fileset>
+ </family>
+
<family>
<nameset>
<name>serif</name>