summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rwxr-xr-xdocs/html/guide/market/billing/billing_integrate.jd5
-rw-r--r--docs/html/guide/practices/screens_support.jd64
-rw-r--r--docs/html/guide/topics/resources/providing-resources.jd14
-rw-r--r--docs/html/index.jd10
-rw-r--r--docs/html/resources/dashboard/platform-versions.jd20
5 files changed, 77 insertions, 36 deletions
diff --git a/docs/html/guide/market/billing/billing_integrate.jd b/docs/html/guide/market/billing/billing_integrate.jd
index 26bda66..7532337 100755
--- a/docs/html/guide/market/billing/billing_integrate.jd
+++ b/docs/html/guide/market/billing/billing_integrate.jd
@@ -121,7 +121,6 @@ parent.link=index.html
<p>The in-app billing sample application is available as a downloadable component of the Android SDK. To download the sample application component, launch the Android SDK and AVD Manager and then select the "Google Market Billing package" component (see figure 1), and click <strong>Install Selected</strong> to begin the download.</p>
-<div style="margin-bottom:2em;">
<img src="{@docRoot}images/billing_package.png" height="325" id="figure1" />
<p class="img-caption">
@@ -296,7 +295,7 @@ parent.link=index.html
<pre>
try {
boolean bindResult = mContext.bindService(
- new Intent(IMarketBillingService.class.getName()), this, Context.BIND_AUTO_CREATE);
+ new Intent("com.android.vending.billing.MarketBillingService.BIND"), this, Context.BIND_AUTO_CREATE);
if (bindResult) {
Log.i(TAG, "Service bind successful.");
} else {
@@ -664,8 +663,6 @@ public class BillingReceiver extends BroadcastReceiver {
<p class="caution"><strong>Important</strong>: To keep your public key safe from malicious users and hackers, do not embed your public key as an entire literal string. Instead, construct the string at runtime from pieces or use bit manipulation (for example, XOR with some other string) to hide the actual key. The key itself is not secret information, but you do not want to make it easy for a hacker or malicious user to replace the public key with another key.</p>
-<div style="margin-bottom:2em;">
-
<img src="{@docRoot}images/billing_public_key.png" height="510" id="figure2" />
<p class="img-caption">
<strong>Figure 2.</strong> The Licensing and In-app Billing panel of your account's Edit Profile page lets you see your public key.
diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd
index 520bd28..9875a6e 100644
--- a/docs/html/guide/practices/screens_support.jd
+++ b/docs/html/guide/practices/screens_support.jd
@@ -189,12 +189,32 @@ offer UI designed for the generalized sizes and densities and let the system
handle the actual rendering of the UI on the current device screen according to
its characteristics. </p>
-
<img src="{@docRoot}images/screens_support/screens-ranges.png" />
<p class="img-caption"><strong>Figure 1.</strong>
Illustration of how the Android platform maps actual screen densities and sizes
to generalized density and size configurations. </p>
+<p>Layout designs often need to be done against a minimum amount of
+available space, so each screen size bucket has an associated minimum size.
+These sizes are in "dp" units -- the same units you should use in defining
+your layouts, which allow us to avoid worrying about changes in screen density.</p>
+
+<ul>
+<li> <em>xlarge</em> screens are at least 960dp x 720dp.
+<li> <em>large</em> screens are at least 640dp x 480dp.
+<li> <em>normal</em> screens are at least 470dp x 320dp.
+<li> <em>small</em> screens are at least 426dp x 320dp.
+</ul>
+
+<p>Note that these minimum screen sizes were not
+as well defined prior to Android 3.0, so you may encounter some devices
+that are mis-classified between normal and large. These are also based
+on the physical resolution of the screen, so may vary across devices --
+for example a 1024x720 tablet with a system bar would actually have a bit
+less space available to the application due to it being used by the system
+bar. Android does not currently support screens smaller than the "small"
+426dp x 320dp size.</p>
+
<p>Although the platform lets your application provide customized resources for
the various size and density configurations, you do not need to do write
custom code or provide custom resources for every combination of screen size and density.
@@ -212,7 +232,8 @@ of the emulator skins to replicate the characteristics of any specific
screen.</p>
<p class="table-caption" id="screens-table"><strong>Table 1.</strong> Screen
-sizes and densities of emulator skins included in the Android SDK.</p>
+sizes and densities of emulator skins included in the Android SDK and other
+representative resolutions.</p>
<table>
<tbody>
@@ -235,27 +256,33 @@ sizes and densities of emulator skins included in the Android SDK.</p>
<td style="background-color:#f3f3f3">
<em>Small</em> screen
</td>
- <td style="font-size:.9em;">QVGA (240x320)</td>
+ <td style="font-size:.9em;"><strong>QVGA (240x320)</strong></td>
</td>
<td></td>
- <td></td>
+ <td style="font-size:.9em;">480x640</td>
<td></td>
</tr>
<tr>
<td style="background-color:#f3f3f3">
<em>Normal</em> screen
</td>
- <td style="font-size:.9em;">WQVGA400 (240x400)<br>WQVGA432 (240x432)</td>
- <td style="font-size:.9em;">HVGA (320x480)</td>
- <td style="font-size:.9em;">WVGA800 (480x800)<br>WVGA854 (480x854)</td>
- <td style="font-size:.9em;"></td>
+ <td style="font-size:.9em;"><strong>WQVGA400 (240x400)</strong>
+ <br><strong>WQVGA432 (240x432)</strong></td>
+ <td style="font-size:.9em;"><strong>HVGA (320x480)</strong></td>
+ <td style="font-size:.9em;"><strong>WVGA800 (480x800)</strong>
+ <br><strong>WVGA854 (480x854)</strong>
+ <br>600x1024</td>
+ <td style="font-size:.9em;">640x960</td>
</tr>
<tr>
<td style="background-color:#f3f3f3">
<em>Large</em> screen
</td>
- <td></td>
- <td style="font-size:.9em;">WVGA800* (480x800)<br>WVGA854* (480x854)</td>
+ <td style="font-size:.9em;"><strong>WVGA800** (480x800)</strong>
+ <br><strong>WVGA854** (480x854)</strong></td>
+ <td style="font-size:.9em;"><strong>WVGA800* (480x800)</strong>
+ <br><strong>WVGA854* (480x854)</strong>
+ <br>600x1024</td>
<td></td>
<td></td>
</tr>
@@ -263,10 +290,13 @@ sizes and densities of emulator skins included in the Android SDK.</p>
<td style="background-color:#f3f3f3">
<em>Extra Large</em> screen
</td>
- <td></td>
- <td></td>
- <td></td>
- <td></td>
+ <td style="font-size:.9em;">600x1024</td>
+ <td style="font-size:.9em;">768x1024<br><strong>WXGA (768x1280)</strong>
+ <br>800x1280</td>
+ <td style="font-size:.9em;">1152x1536<br>1152x1920
+ <br>1200x1920</td>
+ <td style="font-size:.9em;">1536x2048<br>1536x2560
+ <br>1600x2560</td>
</tr>
<tr>
<td colspan="4" style="border:none;font-size:90%;">* To emulate this
@@ -274,6 +304,12 @@ sizes and densities of emulator skins included in the Android SDK.</p>
creating an AVD that uses a WVGA800 or WVGA854 skin.
</td>
</tr>
+ <tr>
+ <td colspan="4" style="border:none;font-size:90%;">** To emulate this
+ configuration, specify a custom density of 120 when
+ creating an AVD that uses a WVGA800 or WVGA854 skin.
+ </td>
+ </tr>
</table>
<p>For an overview of the relative numbers of high (hdpi), medium (mdpi), and
diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd
index 1583dee..1da2622 100644
--- a/docs/html/guide/topics/resources/providing-resources.jd
+++ b/docs/html/guide/topics/resources/providing-resources.jd
@@ -337,21 +337,25 @@ indicates the current locale.</p>
<li>{@code small}: Screens based on the space available on a
low-density QVGA screen. Considering a portrait HVGA display, this has
the same available width but less height&mdash;it is 3:4 vs. HVGA's
- 2:3 aspect ratio. Examples are QVGA low density and VGA high
+ 2:3 aspect ratio. The minimum layout size for this screen configuration
+ is approximately 320x426 dp units. Examples are QVGA low density and VGA high
density.</li>
<li>{@code normal}: Screens based on the traditional
medium-density HVGA screen. A screen is considered to be normal if it is
- at least this size (independent of density) and not larger. Examples
+ at least this size (independent of density) and not larger. The minimum
+ layout size for this screen configuration is approximately 320x470 dp units. Examples
of such screens a WQVGA low density, HVGA medium density, WVGA
high density.</li>
<li>{@code large}: Screens based on the space available on a
medium-density VGA screen. Such a screen has significantly more
available space in both width and height than an HVGA display.
+ The minimum layout size for this screen configuration is approximately 480x640 dp units.
Examples are VGA and WVGA medium density screens.</li>
<li>{@code xlarge}: Screens that are considerably larger than the traditional
- medium-density HVGA screen. In most cases, devices with extra large screens would be too
-large to carry in a pocket and would most likely be tablet-style devices. <em>Added in API Level
-9.</em></li>
+ medium-density HVGA screen. The minimum layout size for this screen configuration
+ is approximately 720x960 dp units. In most cases, devices with extra large
+ screens would be too large to carry in a pocket and would most likely
+ be tablet-style devices. <em>Added in API Level 9.</em></li>
</ul>
<p><em>Added in API Level 4.</em></p>
<p>See <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 7fcd7b6..78f71ac 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -11,10 +11,14 @@ home=true
</div><!-- end homeTitle -->
<div id="announcement-block">
<!-- total max width is 520px -->
- <img src="{@docRoot}assets/images/home/GDC2011.png" alt="Android at GDC 2011" width="203px" style="padding-left:22px;padding-bottom:28px;padding-top:22px;"/>
+ <img src="{@docRoot}assets/images/home/IO-logo-2011.png"
+alt="Android at Google IO 2011" width="200px"
+style="padding-left:22px;padding-bottom:15px;padding-top:15px;"/>
<div id="announcement" style="width:275px">
- <p>Thanks to everyone who visited us at the <a href="http://www.gdconf.com/">Game Developers Conference</a> in San Francisco. We're looking forward to seeing your games running on Android!</p>
- <p><a href="http://android-developers.blogspot.com/2011/02/heading-for-gdc.html">Learn more &raquo;</a></p>
+ <p>Google I/O is a two-day developer event that will take place May 10-11 at Moscone Center, San
+Francisco. The agenda includes several sessions about Android, presented by Android engineers and
+other team members.</p><p><a href="http://www.google.com/events/io/2011/sessions.html">Learn
+more &raquo;</a></p>
</div> <!-- end annoucement -->
</div> <!-- end annoucement-block -->
</div><!-- end topAnnouncement -->
diff --git a/docs/html/resources/dashboard/platform-versions.jd b/docs/html/resources/dashboard/platform-versions.jd
index 73d7fc1..5d7b651 100644
--- a/docs/html/resources/dashboard/platform-versions.jd
+++ b/docs/html/resources/dashboard/platform-versions.jd
@@ -52,7 +52,7 @@ Android Market within a 14-day period ending on the data collection date noted b
<div class="dashboard-panel">
<img alt="" height="250" width="460"
-src="http://chart.apis.google.com/chart?&cht=p&chs=460x250&chd=t:3.0,4.8,29.0,61.3,0.7,1.0,0.2&chl=Android%201.5|Android%201.6|Android%202.1|Android%202.2|Android%202.3|Android%202.3.3|Android%203.0&chco=c4df9b,6fad0c" />
+src="http://chart.apis.google.com/chart?&cht=p&chs=460x250&chd=t:2.7,3.5,27.2,63.9,0.8,1.7,0.2&chl=Android%201.5|Android%201.6|Android%202.1|Android%202.2|Android%202.3|Android%202.3.3|Android%203.0&chco=c4df9b,6fad0c" />
<table>
<tr>
@@ -60,16 +60,16 @@ src="http://chart.apis.google.com/chart?&cht=p&chs=460x250&chd=t:3.0,4.8,29.0,61
<th>API Level</th>
<th>Distribution</th>
</tr>
-<tr><td>Android 1.5</td><td>3</td><td>3.0%</td></tr>
-<tr><td>Android 1.6</td><td>4</td><td>4.8%</td></tr>
-<tr><td>Android 2.1</td><td>7</td><td>29.0%</td></tr>
-<tr><td>Android 2.2</td><td>8</td><td>61.3%</td></tr>
-<tr><td>Android 2.3</td><td>9</td><td>0.7%</td></tr>
-<tr><td>Android 2.3.3</td><td>10</td><td>1.0%</td></tr>
+<tr><td>Android 1.5</td><td>3</td><td>2.7%</td></tr>
+<tr><td>Android 1.6</td><td>4</td><td>3.5%</td></tr>
+<tr><td>Android 2.1</td><td>7</td><td>27.2%</td></tr>
+<tr><td>Android 2.2</td><td>8</td><td>63.9%</td></tr>
+<tr><td>Android 2.3</td><td>9</td><td>0.8%</td></tr>
+<tr><td>Android 2.3.3</td><td>10</td><td>1.7%</td></tr>
<tr><td>Android 3.0</td><td>11</td><td>0.2%</td></tr>
</table>
-<p><em>Data collected during two weeks ending on March 15, 2011</em></p>
+<p><em>Data collected during two weeks ending on April 1, 2011</em></p>
<!--
<p style="font-size:.9em">* <em>Other: 0.1% of devices running obsolete versions</em></p>
-->
@@ -98,9 +98,9 @@ Android Market within a 14-day period ending on the date indicated on the x-axis
<div class="dashboard-panel">
<img alt="" height="250" width="660" style="padding:5px;background:#fff"
-src="http://chart.apis.google.com/chart?&cht=lc&chs=660x250&chxt=x,x,y,r&chxr=0,0,12|1,0,12|2,0,100|3,0,100&chxl=0%3A%7C09/15%7C10/01%7C10/15%7C11/01%7C11/15%7C12/01%7C12/15%7C01/01%7C01/15%7C02/01%7C02/15%7C03/01%7C03/15%7C1%3A%7C2010%7C%7C%7C%7C%7C%7C%7C2011%7C%7C%7C%7C%7C2011%7C2%3A%7C0%25%7C25%25%7C50%25%7C75%25%7C100%25%7C3%3A%7C0%25%7C25%25%7C50%25%7C75%25%7C100%25&chxp=0,0,1,2,3,4,5,6,7,8,9,10,11,12&chxtc=0,5&chd=t:99.9,99.9,99.9,100.0,99.9,99.8,99.7,100.0,99.9,99.9,99.9,100.0,99.8|89.2,90.2,91.1,92.0,92.7,93.4,94.1,95.2,95.6,96.0,96.3,96.7,96.8|72.1,73.8,75.3,77.4,79.6,82.2,84.4,87.2,88.3,89.7,90.5,91.5,92.0|32.1,33.4,34.5,37.1,40.5,44.3,47.7,51.8,54.3,58.3,59.7,61.5,63.0|0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.4,0.6,0.7,0.8,1.1,1.7|0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0&chm=tAndroid 1.5,7caa36,0,0,15,,t::-5|b,c3df9b,0,1,0|tAndroid 1.6,689326,1,0,15,,t::-5|b,b4db77,1,2,0|tAndroid 2.1,547a19,2,0,15,,t::-5|b,a5db51,2,3,0|tAndroid 2.2,3f5e0e,3,0,15,,t::-5|b,96dd28,3,4,0|b,83c916,4,5,0|B,6fad0c,5,6,0&chg=7,25&chdl=Android 1.5|Android 1.6|Android 2.1|Android 2.2|Android 2.3|Android 2.3.3&chco=add274,9dd14f,8ece2a,7ab61c,659b11,507d08" />
+src="http://chart.apis.google.com/chart?&cht=lc&chs=660x250&chxt=x,x,y,r&chxr=0,0,12|1,0,12|2,0,100|3,0,100&chxl=0%3A%7C10/01%7C10/15%7C11/01%7C11/15%7C12/01%7C12/15%7C01/01%7C01/15%7C02/01%7C02/15%7C03/01%7C03/15%7C04/01%7C1%3A%7C2010%7C%7C%7C%7C%7C%7C2011%7C%7C%7C%7C%7C%7C2011%7C2%3A%7C0%25%7C25%25%7C50%25%7C75%25%7C100%25%7C3%3A%7C0%25%7C25%25%7C50%25%7C75%25%7C100%25&chxp=0,0,1,2,3,4,5,6,7,8,9,10,11,12&chxtc=0,5&chd=t:99.9,99.9,100.0,99.9,99.8,99.7,100.0,99.9,99.9,99.9,100.0,99.8,99.7|90.2,91.1,92.0,92.7,93.4,94.1,95.2,95.6,96.0,96.3,96.7,96.8,97.0|73.8,75.3,77.4,79.6,82.2,84.4,87.2,88.3,89.7,90.5,91.5,92.0,93.5|33.4,34.5,37.1,40.5,44.3,47.7,51.8,54.3,58.3,59.7,61.5,63.0,66.3|0.0,0.0,0.0,0.0,0.0,0.0,0.4,0.6,0.7,0.8,1.1,1.7,2.5|0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,1.7&chm=b,c3df9b,0,1,0|tAndroid 1.6,689326,1,0,15,,t::-5|b,b4db77,1,2,0|tAndroid 2.1,547a19,2,0,15,,t::-5|b,a5db51,2,3,0|tAndroid 2.2,3f5e0e,3,0,15,,t::-5|b,96dd28,3,4,0|b,83c916,4,5,0|B,6fad0c,5,6,0&chg=7,25&chdl=Android 1.5|Android 1.6|Android 2.1|Android 2.2|Android 2.3|Android 2.3.3&chco=add274,9dd14f,8ece2a,7ab61c,659b11,507d08" />
-<p><em>Last historical dataset collected during two weeks ending on March 15, 2011</em></p>
+<p><em>Last historical dataset collected during two weeks ending on April 1, 2011</em></p>
</div><!-- end dashboard-panel -->