am eab4fe7a: am 4c4a47f4: docs: add developer dashboard page and add topic link to it from the homepage (replacing the video topic)
Merge commit 'eab4fe7a425532717bfc948430de73637ed81c84'
* commit 'eab4fe7a425532717bfc948430de73637ed81c84':
docs: add developer dashboard page and add topic link
diff --git a/docs/html/images/icon_dashboard.png b/docs/html/images/icon_dashboard.png
new file mode 100644
index 0000000..04793e0
--- /dev/null
+++ b/docs/html/images/icon_dashboard.png
Binary files differ
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 0d72e80..d340793 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -76,11 +76,17 @@
<td colspan="2"><div class="seperator"> </div></td>
</tr>
<tr>
- <td class="imageCell"><a href="http://www.youtube.com/user/androiddevelopers"><img src="{@docRoot}assets/images/video-droid.png" style="padding:0" /></a></td>
+ <td class="imageCell"><a
+href="{@docRoot}resources/dashboard/platform-versions.html"><img
+src="{@docRoot}images/icon_dashboard.png" style="padding:0" /></a></td>
<td>
- <h2 class="green">Watch</h2>
- <object width="150" height="140"><param name="movie" value="http://www.youtube.com/v/N6YdwzAvwOA&hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/N6YdwzAvwOA&hl=en&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="150" height="140"></embed></object>
- <p style="margin-top:1em"><a href="{@docRoot}videos/index.html">More Android videos »</a></p>
+ <h2 class="green">Target Devices</h2>
+ <p>The Device Dashboard
+provides information about deployed Android devices to
+help you target suitable device configurations as you build and update your
+apps.</p>
+ <p><a
+href="{@docRoot}resources/dashboard/platform-versions.html">Learn more »</a></p>
</td>
</tr>
diff --git a/docs/html/resources/dashboard/platform-versions.jd b/docs/html/resources/dashboard/platform-versions.jd
new file mode 100644
index 0000000..2757850
--- /dev/null
+++ b/docs/html/resources/dashboard/platform-versions.jd
@@ -0,0 +1,79 @@
+page.title=Platform Versions
+@jd:body
+
+<style type="text/css">
+div.dashboard-panel {
+ max-width:928px;
+ margin:0 0 1em 0;
+ padding:20px 20px 0 20px;
+ border:1px solid #d3ecf5;
+ border-radius:7px;
+ -moz-border-radius:7px;
+ -webkit-border-radius:7px;
+ background-color: #DAF3FC;
+ box-shadow:2px 3px 1px #eee;
+ -moz-box-shadow:2px 3px 1px #eee;
+ -webkit-box-shadow:2px 3px 1px #eee;
+ overflow:hidden;
+}
+#jd-content div.dashboard-panel img {
+ margin:0 20px 20px 0;
+ padding:0;
+ border:1px solid #ccc;
+ float:left;
+}
+div.dashboard-panel table {
+ margin:0 0 20px 0;
+ float:left;
+ background-color:#fff;
+}
+div.dashboard-panel th {
+ white-space:nowrap;
+}
+</style>
+
+<p>This page provides data about the relative number of active devices
+running a given version of the Android platform. This can help you
+understand the landscape of device distribution and decide how to prioritize
+the development of your application features for the devices currently in the
+the hands of users.</p>
+
+<p class="note"><strong>Note:</strong> This data is based on the number
+of Android devices that have accessed Android Market within a 14-day period
+ending on the data collection date noted below.</p>
+
+<div class="dashboard-panel">
+
+<img alt="" width="400" height="250"
+src="http://chart.apis.google.com/chart?cht=p&chs=400x250&chd=t:0.3,27.7,54.2,2.9,14.8&chl=Android%201.1|Android%201.5|Android%201.6|Android%202.0|Android%202.0.1&chco=c4df9b,6fad0c" />
+
+<!-- f6faf2,a3c539 -->
+
+<table>
+<tr>
+ <th>Android Platform</th>
+ <th>Percent of Devices</th>
+</tr>
+<tr>
+ <td>Android 1.1</td>
+ <td>0.3%</td>
+</tr>
+<tr>
+ <td>Android 1.5</td>
+ <td>27.7%</td>
+</tr>
+<tr>
+ <td>Android 1.6</td>
+ <td>54.2%</td></tr>
+<tr>
+ <td>Android 2.0</td>
+ <td>2.9%</td>
+</tr>
+<tr>
+ <td>Android 2.0.1</td>
+ <td>14.8%</td>
+</tr>
+</table>
+</div>
+
+<p><em>Data collected during two weeks ending on 12/14/2009</em></p>
diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs
index 54602bf..40ee818 100644
--- a/docs/html/resources/resources_toc.cs
+++ b/docs/html/resources/resources_toc.cs
@@ -20,6 +20,16 @@
</li>
<li>
+ <h2><span class="en">Device Dashboard</span>
+ </h2>
+ <ul>
+ <li><a href="<?cs var:toroot ?>resources/dashboard/platform-versions.html">
+ <span class="en">Platform Versions</span>
+ </a> <span class="new">new!</span></li>
+ </ul>
+ </li>
+
+ <li>
<h2><span class="en">Technical Articles</span>
</h2>
<ul>
