summaryrefslogtreecommitdiffstats
path: root/data/fonts
diff options
context:
space:
mode:
authorChristian Robertson <robertsonc@google.com>2011-08-09 15:24:25 -0700
committerJustin Ho <justinho@google.com>2011-08-11 15:35:52 -0700
commitbeb2b5cfdb79ac9147296e3a6bd21970a947a6f4 (patch)
tree5a34daca11fbcdb54c00b579bf85f97938c43764 /data/fonts
parent9cc07c3939581909bf7de42df0215a65fab7b472 (diff)
downloadframeworks_base-beb2b5cfdb79ac9147296e3a6bd21970a947a6f4.zip
frameworks_base-beb2b5cfdb79ac9147296e3a6bd21970a947a6f4.tar.gz
frameworks_base-beb2b5cfdb79ac9147296e3a6bd21970a947a6f4.tar.bz2
Replacing sans serif system font with Roboto
Change-Id: Ibe0aa11e2259898e65dc422c7794ab4065a0a90e
Diffstat (limited to 'data/fonts')
-rwxr-xr-xdata/fonts/Roboto-Bold.ttfbin0 -> 80588 bytes
-rwxr-xr-xdata/fonts/Roboto-BoldCondensed.ttfbin0 -> 80508 bytes
-rwxr-xr-xdata/fonts/Roboto-BoldCondensedItalic.ttfbin0 -> 83364 bytes
-rwxr-xr-xdata/fonts/Roboto-BoldItalic.ttfbin0 -> 83452 bytes
-rwxr-xr-xdata/fonts/Roboto-Condensed.ttfbin0 -> 80000 bytes
-rwxr-xr-xdata/fonts/Roboto-CondensedItalic.ttfbin0 -> 82968 bytes
-rwxr-xr-xdata/fonts/Roboto-Italic.ttfbin0 -> 83096 bytes
-rwxr-xr-xdata/fonts/Roboto-Regular.ttfbin0 -> 80328 bytes
-rw-r--r--data/fonts/fonts.mk4
-rw-r--r--data/fonts/system_fonts.xml16
10 files changed, 18 insertions, 2 deletions
diff --git a/data/fonts/Roboto-Bold.ttf b/data/fonts/Roboto-Bold.ttf
new file mode 100755
index 0000000..32c1794
--- /dev/null
+++ b/data/fonts/Roboto-Bold.ttf
Binary files differ
diff --git a/data/fonts/Roboto-BoldCondensed.ttf b/data/fonts/Roboto-BoldCondensed.ttf
new file mode 100755
index 0000000..61da020
--- /dev/null
+++ b/data/fonts/Roboto-BoldCondensed.ttf
Binary files differ
diff --git a/data/fonts/Roboto-BoldCondensedItalic.ttf b/data/fonts/Roboto-BoldCondensedItalic.ttf
new file mode 100755
index 0000000..b946dce
--- /dev/null
+++ b/data/fonts/Roboto-BoldCondensedItalic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-BoldItalic.ttf b/data/fonts/Roboto-BoldItalic.ttf
new file mode 100755
index 0000000..551bae2
--- /dev/null
+++ b/data/fonts/Roboto-BoldItalic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Condensed.ttf b/data/fonts/Roboto-Condensed.ttf
new file mode 100755
index 0000000..73a868f
--- /dev/null
+++ b/data/fonts/Roboto-Condensed.ttf
Binary files differ
diff --git a/data/fonts/Roboto-CondensedItalic.ttf b/data/fonts/Roboto-CondensedItalic.ttf
new file mode 100755
index 0000000..a0969bb
--- /dev/null
+++ b/data/fonts/Roboto-CondensedItalic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Italic.ttf b/data/fonts/Roboto-Italic.ttf
new file mode 100755
index 0000000..9795cc0
--- /dev/null
+++ b/data/fonts/Roboto-Italic.ttf
Binary files differ
diff --git a/data/fonts/Roboto-Regular.ttf b/data/fonts/Roboto-Regular.ttf
new file mode 100755
index 0000000..8545f29
--- /dev/null
+++ b/data/fonts/Roboto-Regular.ttf
Binary files differ
diff --git a/data/fonts/fonts.mk b/data/fonts/fonts.mk
index 9a590bb..73fb111 100644
--- a/data/fonts/fonts.mk
+++ b/data/fonts/fonts.mk
@@ -15,6 +15,10 @@
# Warning: this is actually a product definition, to be inherited from
PRODUCT_COPY_FILES := \
+ frameworks/base/data/fonts/Roboto-Regular.ttf:system/fonts/Roboto-Regular.ttf \
+ frameworks/base/data/fonts/Roboto-Bold.ttf:system/fonts/Roboto-Bold.ttf \
+ frameworks/base/data/fonts/Roboto-Italic.ttf:system/fonts/Roboto-Italic.ttf \
+ frameworks/base/data/fonts/Roboto-BoldItalic.ttf:system/fonts/Roboto-BoldItalic.ttf \
frameworks/base/data/fonts/DroidSans.ttf:system/fonts/DroidSans.ttf \
frameworks/base/data/fonts/DroidSans-Bold.ttf:system/fonts/DroidSans-Bold.ttf \
frameworks/base/data/fonts/DroidNaskh-Regular.ttf:system/fonts/DroidNaskh-Regular.ttf \
diff --git a/data/fonts/system_fonts.xml b/data/fonts/system_fonts.xml
index 8d8d020..76a5002 100644
--- a/data/fonts/system_fonts.xml
+++ b/data/fonts/system_fonts.xml
@@ -27,8 +27,10 @@
<name>verdana</name>
</nameset>
<fileset>
- <file>DroidSans.ttf</file>
- <file>DroidSans-Bold.ttf</file>
+ <file>Roboto-Regular.ttf</file>
+ <file>Roboto-Bold.ttf</file>
+ <file>Roboto-Italic.ttf</file>
+ <file>Roboto-BoldItalic.ttf</file>
</fileset>
</family>
@@ -53,6 +55,16 @@
</fileset>
</family>
+ <family>
+ <nameset>
+ <name>Droid Sans</name>
+ </nameset>
+ <fileset>
+ <file>DroidSans.ttf</file>
+ <file>DroidSans-Bold.ttf</file>
+ </fileset>
+ </family>
+
<family>
<nameset>
<name>monospace</name>