diff options
author | Scott Main <smain@google.com> | 2012-10-03 16:42:06 -0700 |
---|---|---|
committer | Scott Main <smain@google.com> | 2012-10-03 16:42:06 -0700 |
commit | 4d62456e211a0b4cd77a8967417340612994cb6c (patch) | |
tree | 3310b6924a72e784d49ee4386ca95d178cb92693 /docs/html/design | |
parent | 25a9144bf8728f24a87ca21f9e1c19c5fcc9abdc (diff) | |
parent | f15f8a1b441d8fb1d2548e1ce04000b1681a6d66 (diff) | |
download | frameworks_base-4d62456e211a0b4cd77a8967417340612994cb6c.zip frameworks_base-4d62456e211a0b4cd77a8967417340612994cb6c.tar.gz frameworks_base-4d62456e211a0b4cd77a8967417340612994cb6c.tar.bz2 |
resolved conflicts for merge of f15f8a1b to jb-dev
Change-Id: Ic20777658426aa27304858dd51f315ee967a7bfa
Diffstat (limited to 'docs/html/design')
-rw-r--r-- | docs/html/design/downloads/index.jd | 27 | ||||
-rw-r--r-- | docs/html/design/patterns/actionbar.jd | 3 | ||||
-rw-r--r-- | docs/html/design/style/color.jd | 3 | ||||
-rw-r--r-- | docs/html/design/style/iconography.jd | 3 | ||||
-rw-r--r-- | docs/html/design/style/typography.jd | 6 |
5 files changed, 28 insertions, 14 deletions
diff --git a/docs/html/design/downloads/index.jd b/docs/html/design/downloads/index.jd index 5f78aea..00f4467 100644 --- a/docs/html/design/downloads/index.jd +++ b/docs/html/design/downloads/index.jd @@ -12,7 +12,8 @@ You can also download individual files listed below.</p> <div class="layout-content-col span-4"> <p> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Downloads_20120823.zip">Download All</a> + <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> </p> </div> @@ -37,10 +38,14 @@ available.</p> <div class="layout-content-col span-4"> <p> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Fireworks_Stencil_20120814.png">Adobe® Fireworks® PNG Stencil</a> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Illustrator_Vectors_20120814.ai">Adobe® Illustrator® Stencil</a> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_OmniGraffle_Stencil_20120814.graffle">Omni® OmniGraffle® Stencil</a> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Holo_Widgets_20120814.zip">Adobe® Photoshop® Sources</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Fireworks Stencil']);" + href="{@docRoot}downloads/design/Android_Design_Fireworks_Stencil_20120814.png">Adobe® Fireworks® PNG Stencil</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Illustrator Stencil']);" + href="{@docRoot}downloads/design/Android_Design_Illustrator_Vectors_20120814.ai">Adobe® Illustrator® Stencil</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'OmniGraffle Stencil']);" + href="{@docRoot}downloads/design/Android_Design_OmniGraffle_Stencil_20120814.graffle">Omni® OmniGraffle® Stencil</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Photoshop Sources']);" + href="{@docRoot}downloads/design/Android_Design_Holo_Widgets_20120814.zip">Adobe® Photoshop® Sources</a> </p> </div> @@ -66,7 +71,8 @@ modify to match your theme, plus source files.</p> <div class="layout-content-col span-4"> <p> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Action Bar Icon Pack</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Action Bar Icons']);" + href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Action Bar Icon Pack</a> </p> </div> @@ -91,8 +97,10 @@ requirements of UI and high-resolution screens.</p> <div class="layout-content-col span-4"> <p> - <a class="download-button" href="{@docRoot}downloads/design/Roboto_Hinted_20120823.zip">Roboto</a> - <a class="download-button" href="{@docRoot}downloads/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Roboto ZIP']);" + href="{@docRoot}downloads/design/Roboto_Hinted_20120823.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> </div> @@ -115,7 +123,8 @@ shade that can be used as a complement when needed.</p> <div class="layout-content-col span-4"> <p> - <a class="download-button" href="{@docRoot}downloads/design/Android_Design_Color_Swatches_20120229.zip">Color Swatches</a> + <a class="download-button" onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Color Swatches']);" + href="{@docRoot}downloads/design/Android_Design_Color_Swatches_20120229.zip">Color Swatches</a> </p> </div> diff --git a/docs/html/design/patterns/actionbar.jd b/docs/html/design/patterns/actionbar.jd index 5484ba3..353cee6 100644 --- a/docs/html/design/patterns/actionbar.jd +++ b/docs/html/design/patterns/actionbar.jd @@ -293,7 +293,8 @@ files for further customization. </p> <p> -<a href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Download the Action Bar Icon Pack</a> +<a onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Action Bar Icons (@actionbar page)']);" + href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Download the Action Bar Icon Pack</a> </p> diff --git a/docs/html/design/style/color.jd b/docs/html/design/style/color.jd index 5be34ac..a7daacf 100644 --- a/docs/html/design/style/color.jd +++ b/docs/html/design/style/color.jd @@ -115,7 +115,8 @@ between visual components. Note that red and green may be indistinguishable to c <p>Blue is the standard accent color in Android's color palette. Each color has a corresponding darker shade that can be used as a complement when needed.</p> -<p><a href="{@docRoot}downloads/design/Android_Design_Color_Swatches_20120229.zip">Download the swatches</a></p> +<p><a onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Color Swatches (@color page)']);" + href="{@docRoot}downloads/design/Android_Design_Color_Swatches_20120229.zip">Download the swatches</a></p> <img src="{@docRoot}design/media/color_spectrum.png"> diff --git a/docs/html/design/style/iconography.jd b/docs/html/design/style/iconography.jd index 3ba3f71..ce11cf7 100644 --- a/docs/html/design/style/iconography.jd +++ b/docs/html/design/style/iconography.jd @@ -109,7 +109,8 @@ files for further customization. </p> <p> -<a href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Download the Action Bar Icon Pack</a> +<a onClick="_gaq.push(['_trackEvent', 'Design', 'Download', 'Action Bar Icons (@iconography page)']);" + href="{@docRoot}downloads/design/Android_Design_Icons_20120814.zip">Download the Action Bar Icon Pack</a> </p> <div class="layout-content-row"> diff --git a/docs/html/design/style/typography.jd b/docs/html/design/style/typography.jd index f58c876..427b8c6 100644 --- a/docs/html/design/style/typography.jd +++ b/docs/html/design/style/typography.jd @@ -18,8 +18,10 @@ italic weights by default.</p> <img src="{@docRoot}design/media/typography_alphas.png"> -<p><a href="{@docRoot}downloads/design/Roboto_Hinted_20120823.zip">Download Roboto</a></p> -<p><a href="{@docRoot}downloads/design/Roboto_Specimen_Book_20111129.pdf">Specimen Book</a></p> +<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> </div> </div> |