summaryrefslogtreecommitdiffstats
path: root/docs/html/design/style
diff options
context:
space:
mode:
authorRoman Nurik <romannurik@google.com>2013-08-14 09:52:41 -0700
committerRoman Nurik <romannurik@google.com>2013-08-14 10:48:26 -0700
commit1a5bb9d5cf13a2d2f9086926a7a020cfa08efd66 (patch)
treead642ebb085b02838ab5799030cf4c4793a80da4 /docs/html/design/style
parente78b4f53392d25eda4a121670aca518df9615f71 (diff)
downloadframeworks_base-1a5bb9d5cf13a2d2f9086926a7a020cfa08efd66.zip
frameworks_base-1a5bb9d5cf13a2d2f9086926a7a020cfa08efd66.tar.gz
frameworks_base-1a5bb9d5cf13a2d2f9086926a7a020cfa08efd66.tar.bz2
Update Typography design guide
Bug: 6947941 Change-Id: I18a5c9cfd9de511c280d8aa7e410b5b9939c6774
Diffstat (limited to 'docs/html/design/style')
-rw-r--r--docs/html/design/style/typography.jd20
1 files changed, 14 insertions, 6 deletions
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>