Update Typography design guide

Bug: 6947941

Change-Id: I18a5c9cfd9de511c280d8aa7e410b5b9939c6774

5 files changed, 24 insertions, 12 deletions

diff --git a/docs/html/design/downloads/index.jd b/docs/html/design/downloads/index.jd
index 00f4467..b13ba62 100644
--- a/docs/html/design/downloads/index.jd
+++ b/docs/html/design/downloads/index.jd
@@ -4,8 +4,10 @@ page.title=Downloads
 <div class="layout-content-row">
   <div class="layout-content-col span-9">
 
-<p>Want everything? We've bundled all the downloads available on Android Design into a single ZIP file.
-You can also download individual files listed below.</p>
+<p>Want everything? We've bundled all the downloads available on Android Design, except for the
+  <a href="#roboto">Roboto</a> font family, into a single ZIP file. You can also download
+  individual files listed below.</p>
+
 <p>You may use these materials without restriction in your apps and to develop your apps.</p>
 
   </div>
@@ -13,7 +15,7 @@ You can also download individual files listed below.</p>
 
 <p>
   <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'All Design Assets']);"
-    href="{@docRoot}downloads/design/Android_Design_Downloads_20120823.zip">Download All</a>
+    href="{@docRoot}downloads/design/Android_Design_Downloads_20130814.zip">Download All</a>
 </p>
 
   </div>
@@ -83,10 +85,12 @@ modify to match your theme, plus source files.</p>
 <div class="layout-content-row">
   <div class="layout-content-col span-5">
 
-<h4>Roboto</h4>
+<h4 id="roboto">Roboto</h4>
 <p>Ice Cream Sandwich introduced a new type family named Roboto, created specifically for the
 requirements of UI and high-resolution screens.</p>
-<p><a href="{@docRoot}design/style/typography.html#actionbar">More on Roboto</a></p>
+<p><a href="{@docRoot}design/style/typography.html">More on Roboto</a></p>
+<p><a href="http://www.google.com/fonts/specimen/Roboto" class="external-link">Roboto on Google Fonts</a></p>
+<p><a href="http://www.google.com/fonts/specimen/Roboto+Condensed" class="external-link">Roboto Condensed on Google Fonts</a></p>
 
   </div>
   <div class="layout-content-col span-4">
@@ -98,7 +102,7 @@ requirements of UI and high-resolution screens.</p>
 
 <p>
   <a class="download-button"  onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Roboto ZIP']);"
-    href="{@docRoot}downloads/design/Roboto_Hinted_20120823.zip">Roboto</a>
+    href="https://github.com/google/roboto/archive/latest-hinted.zip">Roboto</a>
   <a class="download-button"  onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Roboto Specemin Book']);"
     href="{@docRoot}downloads/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a>
 </p>
diff --git a/docs/html/design/media/typography_alphas.png b/docs/html/design/media/typography_alphas.png
deleted file mode 100644
index 4b53bd0..0000000
--- a/docs/html/design/media/typography_alphas.png
+++ /dev/null
diff --git a/docs/html/design/media/typography_variants.png b/docs/html/design/media/typography_variants.png
new file mode 100644
index 0000000..9b49b20
--- /dev/null
+++ b/docs/html/design/media/typography_variants.png
diff --git a/docs/html/design/media/typography_variants@2x.png b/docs/html/design/media/typography_variants@2x.png
new file mode 100644
index 0000000..13e7c4f
--- /dev/null
+++ b/docs/html/design/media/typography_variants@2x.png
diff --git a/docs/html/design/style/typography.jd b/docs/html/design/style/typography.jd
index 114d13b..0d681ab 100644
--- a/docs/html/design/style/typography.jd
+++ b/docs/html/design/style/typography.jd
@@ -10,17 +10,25 @@ page.tags="textview","font"
   </div>
   <div class="layout-content-col span-5">
 
+<p>
+  <a class="download-button"  onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Roboto ZIP']);"
+    href="https://github.com/google/roboto/archive/latest-hinted.zip">Download Roboto</a>
+</p>
+
 <p>The Android design language relies on traditional typographic tools such as scale, space, rhythm,
 and alignment with an underlying grid. Successful deployment of these tools is essential to help
 users quickly understand a screen of information. To support such use of typography, Ice Cream
-Sandwich introduced a new type family named Roboto, created specifically for the requirements of UI
-and high-resolution screens. The current TextView framework supports regular, bold, italic, and bold
-italic weights by default.</p>
+Sandwich introduced a new type family named
+<a href="http://www.google.com/fonts/specimen/Roboto" class="external-link">Roboto</a>, created
+specifically for the requirements of UI and high-resolution screens.</p>
+
+<p>The current {@link android.widget.TextView} framework offers Roboto in thin, light, regular and bold
+weights, along with an italic style for each weight. The framework also offers the
+<a href="http://www.google.com/fonts/specimen/Roboto+Condensed" class="external-link">Roboto Condensed</a>
+variant in regular and bold weights, along with an italic style for each weight.</p>
 
-    <img src="{@docRoot}design/media/typography_alphas.png">
+    <img src="{@docRoot}design/media/typography_variants@2x.png" width="220">
 
-<p><a onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Roboto ZIP (@typography page)']);"
-      href="{@docRoot}downloads/design/Roboto_Hinted_20120823.zip">Download Roboto</a></p>
 <p><a onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Roboto Specimen Booke (@typography page)']);"
       href="{@docRoot}downloads/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a></p>