From 6bb6348f2a542b05b9945f28566fb876cf6aee2e Mon Sep 17 00:00:00 2001
From: Dirk Dougherty <ddougherty@google.com>
Date: Mon, 17 May 2010 15:01:58 -0700
Subject: Doc change: cherry pick from eclair ->docs: add dashboard for screens
 update platform dashboard

Conflicts:

	docs/html/resources/dashboard/platform-versions.jd

Change-Id: I6d812085c96eb61e4f6d6e76af714292fa0d38b1
---
 docs/html/resources/dashboard/platform-versions.jd | 50 ++++++-------
 docs/html/resources/dashboard/screens.jd           | 81 ++++++++++++++++++++++
 docs/html/resources/resources_toc.cs               |  3 +
 3 files changed, 104 insertions(+), 30 deletions(-)
 create mode 100644 docs/html/resources/dashboard/screens.jd

(limited to 'docs/html/resources')

diff --git a/docs/html/resources/dashboard/platform-versions.jd b/docs/html/resources/dashboard/platform-versions.jd
index ec7e9da..c77e7b7 100644
--- a/docs/html/resources/dashboard/platform-versions.jd
+++ b/docs/html/resources/dashboard/platform-versions.jd
@@ -2,9 +2,10 @@ page.title=Platform Versions
 @jd:body
 
 <style type="text/css">
+
 div.dashboard-panel {
-  max-width:928px;
-  margin:0 0 1em 0;
+  max-width:1000px;
+  margin:0 0 2em 0;
   padding:20px 20px 0 20px;
   border:1px solid #d3ecf5;
   border-radius:7px;
@@ -22,11 +23,14 @@ div.dashboard-panel {
   border:1px solid #ccc;
   float:left;
 }
-div.dashboard-panel table {
+#jd-content div.dashboard-panel table {
   margin:0 0 20px 0;
   float:left;
   background-color:#fff;
 }
+div.dashboard-panel p {
+  clear:left;
+}
 div.dashboard-panel th {
   white-space:nowrap;
 }
@@ -36,7 +40,8 @@ div.dashboard-panel th {
 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 hands of users.</p>
+the hands of users. For information about how to target your application to devices based on
+platform version, see <a href="{@docRoot}guide/appendix/api-levels.html">API Levels</a>.</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
@@ -44,38 +49,23 @@ 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,31.0,47.6,0.7,20.4&chl=Android%201.1|Android%201.5|Android%201.6|Android%202.0|Android%202.0.1&chco=c4df9b,6fad0c" />
-
-<!-- HISTORY
-12/14/09 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
--->
+<img alt="" width="460" height="250"
+src="http://chart.apis.google.com/chart?&cht=p&chs=460x250&chd=t:0.1,35.6,28.1,0.2,0.4,35.6&chl=
+Android%201.1|Android%201.5|Android%201.6|Android%202.0|Android%202.0.1|Android%202.1&chco=c4df9b,
+6fad0c" />
 
 <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>31.0%</td>
-</tr>
-<tr>
-  <td>Android 1.6</td>
-  <td>47.6%</td></tr>
-<tr>
-  <td>Android 2.0</td>
-  <td>0.7%</td>
-</tr>
-<tr>
-  <td>Android 2.0.1</td>
-  <td>20.4%</td>
-</tr>
+<tr><td>Android 1.1</td><td>0.1%</td></tr>
+<tr><td>Android 1.5</td><td>34.1%</td></tr>
+<tr><td>Android 1.6</td><td>28.0%</td></tr>
+<tr><td>Android 2.0</td><td>0.2%</td></tr>
+<tr><td>Android 2.0.1</td><td>0.4%</td></tr>
+<tr><td>Android 2.1</td><td>37.2%</td></tr>
 </table>
+<p><em>Data collected during two weeks ending on May 17, 2010</em></p>
 </div>
 
-<p><em>Data collected during two weeks ending on 1/4/2010</em></p>
diff --git a/docs/html/resources/dashboard/screens.jd b/docs/html/resources/dashboard/screens.jd
new file mode 100644
index 0000000..4ce7596
--- /dev/null
+++ b/docs/html/resources/dashboard/screens.jd
@@ -0,0 +1,81 @@
+page.title=Screen Sizes and Densities
+@jd:body
+
+<style type="text/css">
+
+div.dashboard-panel {
+  max-width:1000px;
+  margin:0 0 2em 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;
+}
+#jd-content div.dashboard-panel table {
+  margin:0 0 20px 0;
+  float:left;
+  background-color:#fff;
+}
+div.dashboard-panel p {
+  clear:left;
+}
+div.dashboard-panel th {
+  white-space:nowrap;
+}
+</style>
+
+<p>This page provides data about the relative number of active devices
+using a particular type of screen, including the screen size and density. For information about how
+your application can support multiple screen types, see <a
+href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a>.</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="460" height="250"
+src="http://chart.apis.google.com/chart?&cht=p&chs=460x250&chd=t:1.0,63.9,35.1&chl=Small%20/%20ldpi|
+Normal%20/%20mdpi|Normal%20/%20hdpi&chco=c4df9b,6fad0c" />
+
+<table>
+<tr>
+<th></th>
+<th scope="col">Low Density</th>
+<th scope="col">Medium Density</th>
+<th scope="col">High Density</th>
+</tr>
+<tr><th scope="row">Small</th> 
+<td class='cent '>1.0%</td> 
+<td></td> 
+<td></td> 
+</tr> 
+<tr><th scope="row">Normal</th> 
+<td></td> 
+<td class='cent hi'>63.7%</td> 
+<td class='cent hi'>35.3%</td> 
+</tr> 
+<tr><th scope="row">Large</th> 
+<td></td> 
+<td></td> 
+<td></td> 
+</tr> 
+</table>
+
+<p><em>Data collected during two weeks ending on May 17, 2010</em></p>
+</div>
+
diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs
index 0d6ecc4..107c604 100644
--- a/docs/html/resources/resources_toc.cs
+++ b/docs/html/resources/resources_toc.cs
@@ -27,6 +27,9 @@
       <li><a href="<?cs var:toroot ?>resources/dashboard/platform-versions.html">
             <span class="en">Platform Versions</span>
           </a></li>
+      <li><a href="<?cs var:toroot ?>resources/dashboard/screens.html">
+            <span class="en">Screen Sizes &amp; Densities</span>
+          </a> <span class="new">new!</span></li>
     </ul>
   </li><?cs
   /if
-- 
cgit v1.1