From beb2b5cfdb79ac9147296e3a6bd21970a947a6f4 Mon Sep 17 00:00:00 2001
From: Christian Robertson <robertsonc@google.com>
Date: Tue, 9 Aug 2011 15:24:25 -0700
Subject: Replacing sans serif system font with Roboto

Change-Id: Ibe0aa11e2259898e65dc422c7794ab4065a0a90e
---
 data/fonts/Roboto-Bold.ttf                | Bin 0 -> 80588 bytes
 data/fonts/Roboto-BoldCondensed.ttf       | Bin 0 -> 80508 bytes
 data/fonts/Roboto-BoldCondensedItalic.ttf | Bin 0 -> 83364 bytes
 data/fonts/Roboto-BoldItalic.ttf          | Bin 0 -> 83452 bytes
 data/fonts/Roboto-Condensed.ttf           | Bin 0 -> 80000 bytes
 data/fonts/Roboto-CondensedItalic.ttf     | Bin 0 -> 82968 bytes
 data/fonts/Roboto-Italic.ttf              | Bin 0 -> 83096 bytes
 data/fonts/Roboto-Regular.ttf             | Bin 0 -> 80328 bytes
 data/fonts/fonts.mk                       |   4 ++++
 data/fonts/system_fonts.xml               |  16 ++++++++++++++--
 10 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100755 data/fonts/Roboto-Bold.ttf
 create mode 100755 data/fonts/Roboto-BoldCondensed.ttf
 create mode 100755 data/fonts/Roboto-BoldCondensedItalic.ttf
 create mode 100755 data/fonts/Roboto-BoldItalic.ttf
 create mode 100755 data/fonts/Roboto-Condensed.ttf
 create mode 100755 data/fonts/Roboto-CondensedItalic.ttf
 create mode 100755 data/fonts/Roboto-Italic.ttf
 create mode 100755 data/fonts/Roboto-Regular.ttf

(limited to 'data')

diff --git a/data/fonts/Roboto-Bold.ttf b/data/fonts/Roboto-Bold.ttf
new file mode 100755
index 0000000..32c1794
Binary files /dev/null and b/data/fonts/Roboto-Bold.ttf differ
diff --git a/data/fonts/Roboto-BoldCondensed.ttf b/data/fonts/Roboto-BoldCondensed.ttf
new file mode 100755
index 0000000..61da020
Binary files /dev/null and b/data/fonts/Roboto-BoldCondensed.ttf differ
diff --git a/data/fonts/Roboto-BoldCondensedItalic.ttf b/data/fonts/Roboto-BoldCondensedItalic.ttf
new file mode 100755
index 0000000..b946dce
Binary files /dev/null and b/data/fonts/Roboto-BoldCondensedItalic.ttf differ
diff --git a/data/fonts/Roboto-BoldItalic.ttf b/data/fonts/Roboto-BoldItalic.ttf
new file mode 100755
index 0000000..551bae2
Binary files /dev/null and b/data/fonts/Roboto-BoldItalic.ttf differ
diff --git a/data/fonts/Roboto-Condensed.ttf b/data/fonts/Roboto-Condensed.ttf
new file mode 100755
index 0000000..73a868f
Binary files /dev/null and b/data/fonts/Roboto-Condensed.ttf differ
diff --git a/data/fonts/Roboto-CondensedItalic.ttf b/data/fonts/Roboto-CondensedItalic.ttf
new file mode 100755
index 0000000..a0969bb
Binary files /dev/null and b/data/fonts/Roboto-CondensedItalic.ttf differ
diff --git a/data/fonts/Roboto-Italic.ttf b/data/fonts/Roboto-Italic.ttf
new file mode 100755
index 0000000..9795cc0
Binary files /dev/null and b/data/fonts/Roboto-Italic.ttf differ
diff --git a/data/fonts/Roboto-Regular.ttf b/data/fonts/Roboto-Regular.ttf
new file mode 100755
index 0000000..8545f29
Binary files /dev/null and b/data/fonts/Roboto-Regular.ttf 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>
-- 
cgit v1.1