diff options
Diffstat (limited to 'docs')
22 files changed, 813 insertions, 238 deletions
diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd index 3127e10..cb5a0b6 100644 --- a/docs/html/guide/developing/device.jd +++ b/docs/html/guide/developing/device.jd @@ -145,6 +145,9 @@ USB device support on Linux. The USB Vendor ID is the value given to the <td>Kyocera</td> <td><code>0482</code></td></tr> <tr> + <td>Lenevo</td> + <td><code>17EF</code></td></tr> + <tr> <td>LG</td> <td><code>1004</code></td></tr> <tr> diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index abea85b..3ec174e 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -222,7 +222,8 @@ <li><a href="<?cs var:toroot ?>guide/topics/manifest/receiver-element.html"><receiver></a></li> <li><a href="<?cs var:toroot ?>guide/topics/manifest/service-element.html"><service></a></li> <li><a href="<?cs var:toroot ?>guide/topics/manifest/supports-gl-texture-element.html"><supports-gl-texture></a></li> - <li><a href="<?cs var:toroot ?>guide/topics/manifest/supports-screens-element.html"><supports-screens></a></li> <!-- ##api level 4## --> + <li><a href="<?cs var:toroot ?>guide/topics/manifest/supports-screens-element.html"><supports-screens></a> + <span class="new">updated</span></li> <!-- ##api level 4## --> <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-configuration-element.html"><uses-configuration></a></li> <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-feature-element.html"><uses-feature></a></li> <!-- ##api level 4## --> <li><a href="<?cs var:toroot ?>guide/topics/manifest/uses-library-element.html"><uses-library></a></li> @@ -256,7 +257,7 @@ <div><a href="<?cs var:toroot ?>guide/topics/renderscript/index.html"> <span class="en">RenderScript</span> </a> - <span class="new-child">new!</span></div> + <span class="new">new!</span></div> <ul> <li><a href="<?cs var:toroot ?>guide/topics/renderscript/graphics.html"> <span class="en">3D Graphics</span> diff --git a/docs/html/guide/publishing/publishing.jd b/docs/html/guide/publishing/publishing.jd index 0cbba53..95d89fa 100644 --- a/docs/html/guide/publishing/publishing.jd +++ b/docs/html/guide/publishing/publishing.jd @@ -23,6 +23,7 @@ page.title=Publishing on Android Market <ol> <li><a href="#OpeningDetails">Opening an app's details page</a></li> <li><a href="#PerformingSearch">Performing a search</a></li> + <li><a href="#BuildaButton">Build an Android Market button</a></li> <li><a href="#UriSummary">Summary of URI formats</a></li> </ol> </li> @@ -317,6 +318,205 @@ publisher name:</p> +<h3 id="BuildaButton">Build an Android Market button</h3> + +<p>Use the following form to input either your application's package name or your publisher name +and generate a button that you can use on your web site. The button will take users to Android +Market to view your application details or view a list of all applications you've published.</p> + +<p>This form offers four versions of the official "Available in Android Market" badge at +recommended sizes. If you would like to create a different size, you can download an EPS file for +the badges from the <a href="http://www.android.com/branding.html">Android Brand Guidelines</a>.</p> + +<style type="text/css"> + +form.button-form { + margin-top:2em; +} + +/* the label and input elements are blocks that float left in order to + keep the left edgets of the input aligned, and IE 6/7 do not fully support "inline-block" */ +label.block { + display: block; + float: left; + width: 100px; + padding-right: 10px; +} + +input.text { + display: block; + float: left; + width: 250px; +} + +div.button-row { + white-space:nowrap; + min-height:80px; +} + +div.button-row input { + vertical-align:120%; +} + +#jd-content div.button-row img { + margin: 0; +} + +</style> + +<script type="text/javascript"> + +// variables for creating 'try it out' demo button +var imagePath = "http://www.android.com/images/brand/" +var linkStart = "<a href=\"http://market.android.com/"; +var imageStart = "\">\n" + + " <img src=\"" + imagePath; +var imageEnd = ".png\"\n" + + " alt=\"Available in Android Market\" />\n</a>"; + +// variables for creating code snippet +var linkStartCode = "<a href=\"http://market.android.com/"; +var imageStartCode = "\">\n" + + " <img src=\"" + imagePath; +var imageEndCode = ".png\"\n" + + " alt=\"Available in Android Market\" />\n</a>"; + +/** Generate the HTML snippet and demo based on form values */ +function buildButton(form) { + if (form["package"].value != "com.android.example") { + $("#preview").show(); + $("#snippet").show().html(linkStartCode + "details?id=" + form["package"].value + + imageStartCode + $('form input[type=radio]:checked').val() + imageEndCode); + $("#button-preview").html(linkStart + "details?id=" + form["package"].value + + imageStart + $('form input[type=radio]:checked').val() + imageEnd); + } else if (form["publisher"].value != "Example, Inc.") { + $("#preview").show(); + $("#snippet").show().html(linkStartCode + "search?q=pub:" + form["publisher"].value + + imageStartCode + $('form input[type=radio]:checked').val() + imageEndCode); + $("#button-preview").html(linkStart + "search?q=pub:" + form["publisher"].value + imageStart + + $('form input[type=radio]:checked').val() + imageEnd); + } else { + alert("Please enter your package name or publisher name"); + } + return false; +} + +/** Listen for Enter key */ +function onTextEntered(event, form, me) { + // 13 = enter + if (event.keyCode == 13) { + buildButton(form); + } +} + +/** When input is focused, remove example text and disable other input */ +function onInputFocus(object, example) { + if (object.value == example) { + $(object).val('').css({'color' : '#000'}); + } + $('input[type="text"]:not(input[name='+object.name+'])', + object.parentNode).attr('disabled','true'); + $('#'+object.name+'-clear').show(); +} + +/** When input is blured, restore example text if appropriate and enable other input */ +function onInputBlur(object, example) { + if (object.value.length < 1) { + $(object).attr('value',example).css({'color':'#ccc'}); + $('input[type="text"]', object.parentNode).removeAttr('disabled'); + $('#'+object.name+'-clear').hide(); + } +} + +/** Clear the form to start over */ +function clearLabel(id, example) { + $("#preview").hide(); + $('#'+id+'').html('').attr('value',example).css({'color':'#ccc'}); + $('input[type="text"]', $('#'+id+'').parent()).removeAttr('disabled'); + $('#'+id+'-clear').hide(); + return false; +} + +/** When the doc is ready, find the inputs and color the input grey if the value is the example + text. This is necessary to handle back-navigation, which can auto-fill the form with previous + values (and text should not be grey) */ +$(document).ready(function() { + $(".button-form input.text").each(function(index) { + if ($(this).val() == $(this).attr("default")) { + $(this).css("color","#ccc"); + } else { + /* This is necessary to handle back-navigation to the page after form was filled */ + $('input[type="text"]:not(input[name='+this.name+'])', + this.parentNode).attr('disabled','true'); + $('#'+this.name+'-clear').show(); + } + }); +}); + +</script> + +<form class="button-form"> + <label class="block" for="package">Package name:</label> + <input class="text" type="text" id="package" name="package" + value="com.android.example" + default="com.android.example" + onfocus="onInputFocus(this, 'com.android.example')" + onblur="onInputBlur(this, 'com.android.example')" + onkeyup="return onTextEntered(event, this.parentNode, this)"/> + <a id="package-clear" style="display:none" href="#" + onclick="return clearLabel('package','com.android.example');">clear</a> + <p style="clear:both;margin:0"> <em>or</em></p> + <label class="block" style="margin-top:5px" for="publisher">Publisher name:</label> + <input class="text" type="text" id="publisher" name="publisher" + value="Example, Inc." + default="Example, Inc." + onfocus="onInputFocus(this, 'Example, Inc.')" + onblur="onInputBlur(this, 'Example, Inc.')" + onkeyup="return onTextEntered(event, this.parentNode, this)"/> + <a id="publisher-clear" style="display:none" href="#" + onclick="return clearLabel('publisher','Example, Inc.');">clear</a> + <br/><br/> + +<div class="button-row"> + <input type="radio" name="buttonStyle" value="45_avail_market_logo1" id="ns" checked="checked" /> + <label for="ns"><img src="http://www.android.com/images/brand/45_avail_market_logo1.png" +alt="narrow and small logo" /></label> + + <input type="radio" name="buttonStyle" value="60_avail_market_logo1" id="nm" /> + <label for="nm"><img src="http://www.android.com/images/brand/60_avail_market_logo1.png" +alt="narrow and large logo" /></label> +</div> + +<div class="button-row"> + <input type="radio" name="buttonStyle" value="45_avail_market_logo2" id="ws" /> + <label for="ws"><img src="http://www.android.com/images/brand/45_avail_market_logo2.png" +alt="wide and small logo" /></label> + + <input type="radio" name="buttonStyle" value="60_avail_market_logo2" id="wm" /> + <label for="wm"><img src="http://www.android.com/images/brand/60_avail_market_logo2.png" +alt="wide and large logo" /></label> +</div> + + <input type="button" onclick="return buildButton(this.parentNode)" value="Build my button" +style="padding:5px" /> + <br/> +</form> + +<div id="preview" style="display:none"> + <p>Copy and paste this HTML into your web site:</p> + <textarea id="snippet" cols="80" rows="4" onclick="this.select()" +style="font-family:monospace;background-color:#efefef;padding:5px;display:none;margin-bottom:1em"> + </textarea > + +<p>Try it out:</p> +<div id="button-preview" style="margin-top:1em"></div> +</div> + + + + + + <h3 id="UriSummary">Summary of URI formats</h3> <p>The table below provides a summary of the URIs currently supported by the Android Market (both on diff --git a/docs/html/guide/topics/graphics/index.jd b/docs/html/guide/topics/graphics/index.jd index be1b0fc..2490e39 100644 --- a/docs/html/guide/topics/graphics/index.jd +++ b/docs/html/guide/topics/graphics/index.jd @@ -14,13 +14,20 @@ page.title=Graphics </ol> </li> </ol> + <h2>See also</h2> + <ol> + <li><a href="{@docRoot}guide/topics/graphics/opengl.html">3D with OpenGL</a></li> + <li><a href="{@docRoot}guide/topics/renderscript/index.html">RenderScript</a></li> + </ol> </div> </div> -<p>Android graphics are powered by a custom 2D graphics library and OpenGL ES 1.0 -for high performance 3D graphics. The most common 2D graphics APIs can be found in the -{@link android.graphics.drawable drawable package}. OpenGL APIs are available -from the Khronos {@link javax.microedition.khronos.opengles OpenGL ES package}, -plus some Android {@link android.opengl OpenGL utilities}.</p> + +<p>Android graphics are powered by a custom 2D graphics library, and the framework provides +support for high performance 3D graphics in the form of OpenGL ES and RenderScript. The most +common 2D graphics APIs can be found in the {@link android.graphics.drawable drawable package}. +OpenGL APIs are available from the Khronos {@link javax.microedition.khronos.opengles OpenGL ES} and +the {@link android.opengl} packages. The RenderScript APIs are available in the +{@link android.renderscript} package.</p> <p>When starting a project, it's important to consider exactly what your graphical demands will be. Varying graphical tasks are best accomplished with varying techniques. For example, graphics and animations @@ -32,10 +39,10 @@ and which tasks they're best suited for.</p> <p>If you're specifically looking for information on drawing 3D graphics, this page won't help a lot. However, the information below about how to <a href="#draw-with-canvas">Draw with a -Canvas</a> (and the section on SurfaceView), -will give you a quick idea of how you should draw to the View hierarchy. For more information -on Android's 3D graphic utilities (provided by the OpenGL ES API), -read <a href="opengl.html">3D with OpenGL</a> and refer to other OpenGL documentation.</p> +Canvas</a> (and the section on SurfaceView), will give you a quick idea of how you should draw to +the View hierarchy. For more information on Android's 3D graphics APIs, see +the <a href="opengl.html">3D with OpenGL</a> and +<a href="{@docRoot}guide/topics/renderscript/index.html">RenderScript</a> documents.</p> <h2 id="options">Consider your Options</h2> diff --git a/docs/html/guide/topics/graphics/opengl.jd b/docs/html/guide/topics/graphics/opengl.jd index 9f88954..cc467f2 100644 --- a/docs/html/guide/topics/graphics/opengl.jd +++ b/docs/html/guide/topics/graphics/opengl.jd @@ -3,51 +3,215 @@ parent.title=Graphics parent.link=index.html @jd:body +<div id="qv-wrapper"> + <div id="qv"> + <h2>In this document</h2> + + <ol> + <li><a href="#basics">The Basics</a></li> + <li><a href="#compatibility">OpenGL Versions and Device Compatibility</a> + <ol> + <li><a href="#textures">Texture Compression Support</a></li> + <li><a href="#declare-compression">Declaring Use of Compressed Textures</a></li> + </ol> + </li> + </ol> + <h2>Key classes</h2> + <ol> + <li>{@link android.opengl.GLSurfaceView}</li> + <li>{@link android.opengl.GLSurfaceView.Renderer}</li> + <li>{@link javax.microedition.khronos.opengles}</li> + <li>{@link android.opengl}</li> + </ol> + <h2>Related Samples</h2> + <ol> + <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/ +GLSurfaceViewActivity.html">GLSurfaceViewActivity</a></li> + <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/ +GLES20Activity.html">GLES20Activity</a></li> + <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/ +TouchRotateActivity.html">TouchRotateActivity</a></li> + <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/ +CompressedTextureActivity.html">Compressed Textures</a></li> + </ol> + <h2>See also</h2> + <ol> + <li><a href="{@docRoot}resources/articles/glsurfaceview.html">Introducing +GLSurfaceView</a></li> + <li><a href="http://www.khronos.org/opengles/">OpenGL ES</a></li> + <li><a href="http://www.khronos.org/opengles/1_X/">OpenGL ES 1.x Specification</a></li> + <li><a href="http://www.khronos.org/opengles/2_X/">OpenGL ES 2.x specification</a></li> + </ol> + </div> +</div> -<p>Android includes support for high performance 3D graphics -via the OpenGL API—specifically, the OpenGL ES API.</p> +<p>Android includes support for high performance 2D and 3D graphics with the Open Graphics Library +(OpenGL) API—specifically, the OpenGL ES API. OpenGL is a cross-platform graphics API that +specifies a standard software interface for 3D graphics processing hardware. OpenGL ES is a flavor +of the OpenGL specification intended for embedded devices. The OpenGL ES 1.0 and 1.1 API +specifications have been supported since Android 1.0. Beginning with Android 2.2 (API +Level 8), the framework supports the OpenGL ES 2.0 API specification.</p> -<p>OpenGL ES is a flavor of the OpenGL specification intended for embedded devices. Versions of <a -href="http://www.khronos.org/opengles/">OpenGL ES</a> are loosely peered to versions of the primary -OpenGL standard. Beginning with Android 2.2, the platform supports OpenGL ES 2.0 (with -backward compatibility support for OpenGL ES 1.1). For information about the relative number of -Android-powered devices that support a given version of OpenGL ES, see the <a -href="http://developer.android.com/resources/dashboard/opengl.html">OpenGL ES Versions</a> -dashboard.</p> +<p class="note"><b>Note:</b> The specific API provided by the Android framework is similar to the + J2ME JSR239 OpenGL ES API, but is not identical. If you are familiar with J2ME JSR239 + specification, be alert for variations.</p> -<p>The specific API provided by Android is similar to the J2ME JSR239 OpenGL -ES API. However, it may not be identical, so watch out for deviations.</p> -<h2>Using the API</h2> +<h2 id="basics">The Basics</h2> -<p>Here's how to use the API at an extremely high level:</p> +<p>Android supports OpenGL both through its framework API and the Native Development +Kit (NDK). This topic focuses on the Android framework interfaces. For more information about the +NDK, see the <a href="{@docRoot}sdk/ndk/index.html">Android NDK</a>. -<ol> -<li>Write a custom {@link android.view.View} subclass.</li> -<li>Obtain a handle to an OpenGLContext, which provides access to the OpenGL functionality.</li> -<li>In your View's {@link android.view.View#onDraw onDraw()} method, get a handle to a GL object, -and use its methods to perform GL operations.</li> -</ol> +<p> + There are two foundational classes in the Android framework that let you create and manipulate +graphics with the OpenGL ES API: {@link android.opengl.GLSurfaceView} and {@link +android.opengl.GLSurfaceView.Renderer}. If your goal is to use OpenGL in your Android application, +understanding how to implement these classes in an activity should be your first objective. +</p> + +<dl> + <dt>{@link android.opengl.GLSurfaceView}</dt> + <dd>This class is a container on which you can draw and manipulate objects using OpenGL API calls. + This class is similar in function to a {@link android.view.SurfaceView}, except that it is + specifically for use with OpenGL. You can use this class by simply creating an instance of + {@link android.opengl.GLSurfaceView} and adding your + {@link android.opengl.GLSurfaceView.Renderer Renderer} to it. However, if you want to capture + touch screen events, you should extend the {@link android.opengl.GLSurfaceView} class to + implement the touch listeners, as shown in the <a +href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity +.html">TouchRotateActivity</a> sample.</dd> + + <dt>{@link android.opengl.GLSurfaceView.Renderer}</dt> + <dd>This interface defines the methods required for drawing graphics in an OpenGL {@link + android.opengl.GLSurfaceView}. You must provide an implementation of this interface as a + separate class and attach it to your {@link android.opengl.GLSurfaceView} instance using + {@link android.opengl.GLSurfaceView#setRenderer(android.opengl.GLSurfaceView.Renderer) + GLSurfaceView.setRenderer()}. + + <p>The {@link android.opengl.GLSurfaceView.Renderer} interface requires that you implement the + following methods:</p> + <ul> + <li> + {@link + android.opengl.GLSurfaceView.Renderer#onSurfaceCreated(javax.microedition.khronos.opengles.GL10, + javax.microedition.khronos.egl.EGLConfig) onSurfaceCreated()}: The system calls this + method once, when creating the {@link android.opengl.GLSurfaceView}. Use this method to perform + actions that need to happen only once, such as setting OpenGL environment parameters or + initializing OpenGL graphic objects. + </li> + <li> + {@link + android.opengl.GLSurfaceView.Renderer#onDrawFrame(javax.microedition.khronos.opengles.GL10) + onDrawFrame()}: The system calls this method on each redraw of the {@link + android.opengl.GLSurfaceView}. Use this method as the primary execution point for + drawing (and re-drawing) graphic objects.</li> + <li> + {@link + android.opengl.GLSurfaceView.Renderer#onSurfaceChanged(javax.microedition.khronos.opengles.GL10, + int, int) onSurfaceChanged()}: The system calls this method when the {@link + android.opengl.GLSurfaceView} geometry changes, including changes in size of the {@link + android.opengl.GLSurfaceView} or orientation of the device screen. For example, the system calls + this method when the device changes from portrait to landscape orientation. Use this method to + respond to changes in the {@link android.opengl.GLSurfaceView} container. + </li> + </ul> + </dd> +</dl> + +<p>Once you have established a container view for OpenGL using {@link +android.opengl.GLSurfaceView} and {@link android.opengl.GLSurfaceView.Renderer}, you can begin +calling OpenGL APIs using the following classes:</p> + +<ul> + <li>OpenGL ES 1.0/1.1 API Packages + <ul> + <li>{@link javax.microedition.khronos.opengles} - This package provides the standard +implementation of OpenGL ES 1.0 and 1.1. + <ul> + <li>{@link javax.microedition.khronos.opengles.GL10}</li> + <li>{@link javax.microedition.khronos.opengles.GL10Ext}</li> + <li>{@link javax.microedition.khronos.opengles.GL11}</li> + <li>{@link javax.microedition.khronos.opengles.GL11Ext}</li> + <li>{@link javax.microedition.khronos.opengles.GL11ExtensionPack}</li> + </ul> + </li> + <li>{@link android.opengl} - This package provides a static interface to the OpenGL classes + above. These interfaces were added with Android 1.6 (API Level 4). + <ul> + <li>{@link android.opengl.GLES10}</li> + <li>{@link android.opengl.GLES10Ext}</li> + <li>{@link android.opengl.GLES11}</li> + <li>{@link android.opengl.GLES10Ext}</li> + </ul> + </li> + </ul> + </li> + <li>OpenGL ES 2.0 API Class + <ul> + <li>{@link android.opengl.GLES20 android.opengl.GLES20}</li> + </ul> + </li> +</ul> -<p>Several samples using OpenGL ES are available in the <a -href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/index.html">API -Demos</a> sample application. +<h2 id="compatibility">OpenGL Versions and Device Compatibility</h2> + +<p> + The OpenGL ES 1.0 and 1.1 API specifications have been supported since Android 1.0. +Beginning with Android 2.2 (API Level 8), the framework supports the OpenGL ES 2.0 API +specification. OpenGL ES 2.0 is supported by most Android devices and is recommended for new +applications being developed with OpenGL. For information about the relative number of +Android-powered devices that support a given version of OpenGL ES, see the <a +href="{@docRoot}resources/dashboard/opengl.html">OpenGL ES Versions Dashboard</a>.</p> + +<h3 id="textures">Texture compression support</h3> +<p>Texture compression can significantly increase the performance of your OpenGL application by +reducing memory requirements and making more efficient use of memory bandwidth. The Android +framework provides support for the ETC1 compression format as a standard feature, including a {@link +android.opengl.ETC1Util} utility class and the {@code etc1tool} compression tool (located in your +Android SDK at {@code <sdk>/tools/}).</p> + +<p>For an example of an Android application that uses texture compression, see the <a +href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/ +CompressedTextureActivity.html">CompressedTextureActivity</a> code sample. </p> -<p>A summary of how to actually write 3D applications using OpenGL is -beyond the scope of this text and is left as an exercise for the reader.</p> +<p>To check if the ETC1 format is supported on a device, call the {@link +android.opengl.ETC1Util#isETC1Supported() ETC1Util.isETC1Supported()} method.</p> -<h2>Links to Additional Information</h2> +<p class="note"><b>Note:</b> The ETC1 texture compression format does not support textures with an +alpha channel. If your application requires textures with an alpha channel, you should +investigate other texture compression formats available on your target devices.</p> -<p>Information about OpenGL ES can be -found at <a title="http://www.khronos.org/opengles/" -href="http://www.khronos.org/opengles/">http://www.khronos.org/opengles/</a>.</p> +<p>Beyond the ETC1 format, Android devices have varied support for texture compression based on +their GPU chipsets. You should investigate texture compression support on the the devices you are +are targeting to determine what compression types your application should support.</p> -<p>Information specifically -about OpenGL ES 1.0 (including a detailed specification) can be found -at <a title="http://www.khronos.org/opengles/1_X/" -href="http://www.khronos.org/opengles/1_X/">http://www.khronos.org/opengles/1_X/</a>.</p> +<p>To determine if texture compression formats other than ETC1 are supported on a particular +device:</p> +<ol> + <li>Run the following code on your target devices to determine what texture compression +formats are supported: +<pre> + String extensions = javax.microedition.khronos.opengles.GL10.glGetString(GL10.GL_EXTENSIONS); +</pre> + <p class="warning"><b>Warning:</b> The results of this call vary by device! You must run this +call on several target devices to determine what compression types are commonly supported on +your target devices.</p> + </li> + <li>Review the output of this method to determine what extensions are supported on the +device.</li> +</ol> -<p>The documentation for the Android OpenGL ES implementations are available in {@link -android.opengl} and {@link javax.microedition.khronos.opengles}.</p> +<h3 id="declare-compression">Declaring compressed textures</h3> +<p>Once you have decided which texture compression types your application will support, you +must declare them in your manifest file using <a +href="{@docRoot}guide/topics/manifest/supports-gl-texture-element.html"> +<supports-gl-texture></a>. Declaring this information in your manifest file hides your +application from users with devices that do not support at least one of your declared +compression types. For more information on how Android Market filtering works for texture +compressions, see the <a +href="{@docRoot}guide/topics/manifest/supports-gl-texture-element.html#market-texture-filtering"> +Android Market and texture compression filtering</a> section of the {@code +<supports-gl-texture>} documentation. diff --git a/docs/html/guide/topics/manifest/supports-screens-element.jd b/docs/html/guide/topics/manifest/supports-screens-element.jd index ee99a37..605a2bb 100644 --- a/docs/html/guide/topics/manifest/supports-screens-element.jd +++ b/docs/html/guide/topics/manifest/supports-screens-element.jd @@ -8,12 +8,15 @@ parent.link=manifest-intro.html <dt>syntax:</dt> <dd> <pre class="stx"> -<supports-screens android:<a href="#resizeable">resizeable</a>=["true" | "false"] - android:<a href="#small">smallScreens</a>=["true" | "false"] - android:<a href="#normal">normalScreens</a>=["true" | "false"] - android:<a href="#large">largeScreens</a>=["true" | "false"] +<supports-screens android:<a href="#requiresSmallest">requiresSmallestWidthDp</a>="<em>integer</em>" + android:<a href="#compatibleWidth">compatibleWidthLimitDp</a>="<em>integer</em>" + android:<a href="#largestWidth">largestWidthLimitDp</a>="<em>integer</em>" + android:<a href="#resizeable">resizeable</a>=["true"| "false"] + android:<a href="#small">smallScreens</a>=["true" | "false"] + android:<a href="#normal">normalScreens</a>=["true" | "false"] + android:<a href="#large">largeScreens</a>=["true" | "false"] android:<a href="#xlarge">xlargeScreens</a>=["true" | "false"] - android:<a href="#any">anyDensity</a>=["true" | "false"] /> + android:<a href="#any">anyDensity</a>=["true" | "false"] /> </pre> </dd> @@ -21,36 +24,37 @@ parent.link=manifest-intro.html <dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code></dd> <dt>description:</dt> -<dd>Lets you specify the screen dimensions the -application supports. By default, a modern application (using API Level 4 or higher) supports all -screen sizes; older applications are assumed to support only the "normal" screen size. Screen -size is determined as the available pixels to an application after density scaling has been -applied. (Note that screen size is a separate axis from screen density.) - -<p>An application "supports" a given screen size if it fills the entire screen and works as -expected. By default, the system will resize your application to fill the screen, if you have set +<dd>Lets you specify the screen sizes your application supports and enable screen +compatibility mode for screens larger than what your application supports. By default, a modern +application (using API Level 4 or higher) supports all screen sizes; older applications are assumed +to support only the "normal" screen size. Screen size is determined by the number of pixels on the +screen after the system accounts for screen density scaling. + +<p>An application "supports" a given screen size if it resizes properly to fill the entire screen. +By default, the system resizes your application UI to fill the screen if you have set either <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code minSdkVersion}</a> or <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code -targetSdkVersion}</a> to {@code "4"} or higher. Resizing works well for most applications and -you don't have to do any extra work to make your application work on larger screens.</p> +targetSdkVersion}</a> to {@code "4"} or higher. Normal resizing works well for most applications and +you don't have to do any extra work to make your application work on screens larger than a +handset device.</p> -<p>In addition to allowing the system to resize your application, you can add additional support -for different screen sizes by providing <a +<p>In addition to allowing the system to resize your application to fit the current screen, you can +optimize your UI for different screen sizes by providing <a href="{@docRoot}guide/topics/resources/providing-resources.html#AlternativeResources">alternative layout resources</a> for different sizes. For instance, you might want to modify the layout of an activity when it is on a tablet or similar device that has an <em>xlarge</em> screen.</p> -<p>If your application does not support <em>large</em> or <em>xlarge</em> screens, then you should -declare that it is not resizeable by setting <a href="#resizeable">{@code android:resizeable}</a> to -{@code "false"}, so that the system will not resize your application on larger screens.</p> - -<p>If your application does not support <em>small</em> screens, then -there isn't much the system can do to make the application work well on a smaller screen, so -external services (such as Android Market) should not allow users to install the application on such -screens.</p> - - -<p>For more information, see +<p>However, if your application does not work well when resized to fit different screen sizes, +you can use the attributes of the {@code <supports-screens>} element to control whether +your application should be distributed to smaller screens or have its UI scaled up to fit larger +screens using the system's screen compatibility mode. When you have not designed for larger screen +sizes and the normal resizing does not achieve the appropriate results, <em>screen compatibility +mode</em> will scale your UI by emulating a <em>normal</em> size screen and then zooming in on it so +that it fills the entire screen—thus achieving the same layout as a normal handset device on +the large screen (but this usually causes pixelation and blurring of your UI).</p> + +<p>For more information about how to properly support different screen sizes so that you can avoid +using screen compatibility mode, read <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a>.</p> @@ -59,6 +63,74 @@ screens.</p> <dd> <dl class="attr"> + <dt id="requiresSmallest">{@code android:requiresSmallestWidthDp}</dt> + <dd>This attribute specifies the minimum "smallest screen width" with which your +application is compatible. In order for a device to be considered compatible with your +application, the shortest side of the available screen space must be equal to or greater than this +value. +<p>The width against which your value is compared takes into account screen decorations and system +UI. For example, if the device has some persistent UI elements on the left or right edge of the +display, the system declares the device's available width as one that is smaller than the actual +screen size, accounting for these UI elements because those are screen pixels not available for your +UI. Thus, the value you use should be the actual smallest width required by your layout.</p> +<p>If your application properly resizes for smaller screen sizes (down to the +<em>small</em> size or a minimum width of 320dp), you do +not need to use this attribute. Otherwise, you should use a value for this attribute that +matches the smallest value used by your application for the <a +href="{@docRoot}guide/topics/resources/providing-resources.html#SmallestScreenWidthQualifier"> +smallest screen width qualifier</a> ({@code sw<N>dp}).</p> + +<p>For example, a typical handset screen has a minimum width of 320dp, a 7" tablet has a minimum +width of 600dp, and a 10" tablet has a minimum width of 720dp. If the smallest available screen +width on a device is less than the value you supply here, then the application is considered +incompatible with that +device. External services such as Android Market use this to determine whether a device +is compatible with your application and prevent incompatible devices from installing it.</p> +<p>Beginning with Android 3.2 (API level 13), using this attribute is the preferred way to +specify the minimum screen size your application requires, instead of using the other attributes +for small, normal, large, and xlarge screens. The advantage of using this attribute is that you +have more control over exactly how much screen space your application needs at a minimum in order +to properly display its UI, rather than relying on the generalized size groups.</p> +<p>This attribute has no default value. If this attribute is not specified, then any of the old +<code><a href="#small">smallScreens</a></code>, <code><a href="#normal">normalScreens</a></code>, +<code><a href="#large">largeScreens</a></code>, or <code><a href="#xlarge">xlargeScreens</a></code> +attributes are used instead to determine the smallest screen required.</p> + <p>This attribute was introduced in API level 13.</p> + </dd> + + <dt id="compatibleWidth">{@code android:compatibleWidthLimitDp}</dt> + <dd>This attribute allows you to enable screen compatibility mode as a user-optional feature by +specifying the maximum "smallest screen width" for which your application is designed. If the value +you supply here is less than the shortest side of the available screen space, users can still +install your application, but are offered to run it in screen compatibility mode. By default, screen +compatibility mode is disabled and your layout is resized to fit the screen as usual, but a +button is available in the system bar that allows the user to toggle screen compatibility mode on +and off. + <p>If your application is compatible with all screen sizes and its layout properly resizes, you do +not need to use this attribute.</p> + <p class="note"><strong>Note:</strong> Currently, screen compatibility mode only emulates handset +screens with a 320dp width, so screen compatibility mode is not applied if your value for {@code +android:compatibleWidthLimitDp} is larger than 320.</p> + <p>This attribute was introduced in API level 13.</p> + </dd> + + <dt id="largestWidth">{@code android:largestWidthLimitDp}</dt> + <dd>This attribute allows you to force enable screen compatibility mode by specifying the maximum +"smallest screen width" for which your application is designed. If the value you supply here is less +than the shortest side of the available screen space, the application runs in screen +compatibility mode with no way for the user to disable it. + <p>If your application is compatible with all screen sizes and its layout properly resizes, you do +not need to use this attribute. Otherwise, you should first consider using the <a +href="#compatibleWidth">{@code android:compatibleWidthLimitDp}</a> attribute. You should use the +{@code android:largestWidthLimitDp} attribute only when your application is functionally broken when +resized for larger screens and screen compatibility mode is the only way that users should use +your application.</p> + <p class="note"><strong>Note:</strong> Currently, screen compatibility mode only emulates handset +screens with a 320dp width, so screen compatibility mode is not applied if your value for {@code +android:largestWidthLimitDp} is larger than 320.</p> + <p>This attribute was introduced in API level 13.</p> + </dd> + <dt><a name="resizeable"></a>{@code android:resizeable}</dt> <dd>Indicates whether the application is resizeable for different screen sizes. This attribute is true, by default, if you have set either <a @@ -75,6 +147,7 @@ when resized.</p> application does not work well on larger screens, follow the guide to <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a> to enable additional screen support.</p> + <p><strong>This attribute is deprecated</strong> as of API level 13.</p> </dd> @@ -91,6 +164,7 @@ href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code targe {@code "4"} or higher, the default value for this is {@code "true"}, any value less than {@code "4"} results in this set to {@code "false"}. + <p><strong>This attribute is deprecated</strong> as of API level 13.</p> </dd> <dt><a name="normal"></a>{@code android:normalScreens}</dt> @@ -99,12 +173,13 @@ the default value for this is {@code "true"}, any value less than {@code "4"} re screen, but WQVGA low density and WVGA high density are also considered to be normal. This attribute is "true" by default, and applications currently should leave it that way. + <p><strong>This attribute is deprecated</strong> as of API level 13.</p> </dd> <dt><a name="large"></a>{@code android:largeScreens}</dt> <dd>Indicates whether the application supports larger screen form-factors. A large screen is defined as a screen that is significantly larger - than a "normal" phone screen, and thus might require some special care + than a "normal" handset screen, and thus might require some special care on the application's part to make good use of it, though it may rely on resizing by the system to fill the screen. If the application has set either <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code minSdkVersion}</a> or <a @@ -112,6 +187,7 @@ href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code targe {@code "4"} or higher, the default value for this is {@code "true"}, any value less than {@code "4"} results in this set to {@code "false"}. + <p><strong>This attribute is deprecated</strong> as of API level 13.</p> </dd> <dt><a name="xlarge"></a>{@code android:xlargeScreens}</dt> @@ -125,7 +201,8 @@ href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code targe {@code "4"} or higher, the default value for this is {@code "true"}, any value less than {@code "4"} results in this set to {@code "false"}. - <p>This attribute was introduced in API Level 9.</p> + <p>This attribute was introduced in API level 9.</p> + <p><strong>This attribute is deprecated</strong> as of API level 13.</p> </dd> <dt><a name="any"></a>{@code android:anyDensity}</dt> @@ -142,6 +219,7 @@ the default value for this is {@code "true"}. Otherwise, it is {@code "false"}. down application assets by a factor of 0.75 (low dpi screens) or scale them up by a factor of 1.5 (high dpi screens), when you don't provide alternative resources for a specifc screen density. The screen density is expressed as dots-per-inch (dpi).</p> + <p><strong>This attribute is deprecated</strong> as of API level 13.</p> </dd> diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index a996ccc..ea778c1 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd @@ -335,80 +335,101 @@ indicates the current locale.</p> </tr> <tr id="SmallestScreenWidthQualifier"> <td>Smallest screen width</td> - <td>Examples:<br/> + <td><code>sw<N>dp</code><br/><br/> + Examples:<br/> <code>sw320dp</code><br/> <code>sw600dp</code><br/> <code>sw720dp</code><br/> etc. </td> <td> - <p>Specifies a minimum "smallest screen width," in "dp" units, at which the resource - should be used. This configuration value represents the base screen size - of the device, regardless of the orientation of the display. It is based - on the smallest width the application will have in which to perform its - UI layout (in dp units) regardless of the orientation of the screen. The - value here takes into account screen decorations so if the device has some - persistent UI elements on the left or right edge of the display it must - present a value here that is smaller than the real screen size, accounting - for these UI elements reducing the application's available space.</p> - <p>Some values you may use here for common screen sizes:</p> + <p>Specifies the "smallest width" in {@code dp} units that must be available to your + application in order for the resources to be used, regardless of the screen's current + orientation. For example, if your layout requires that its shortest side be at least 600 + dp in length at all times, then you can use this to create the layout resources, {@code + res/layout-sw600dp/}, and the system will use them only when the shortest side of + available screen space it at least 600dp.</p> + <p>The width against which the system compares your value takes into account screen + decorations and system UI. For example, if the device has some persistent UI elements on the + left or right edge of the display, the system declares its own available width as one that + is smaller than the actual screen size, accounting for these UI elements because those are + screen pixels not available for your UI. Thus, the value you use should be the actual + smallest width required by your layout.</p> + <p>Some values you might use here for common screen sizes:</p> <ul> - <li>240x320 ldpi (QVGA phone): 320 - <li>320x480 mdpi (phone): 320 - <li>480x800 hdpi (high density phone): 320 - <li>480x800 mdpi (tablet/phone): 480 - <li>600x1024 mdpi (7" tablet): 600 - <li>720x1280 mdpi (10" tablet): 720 + <li>320, for devices with screen configurations such as: + <ul> + <li>240x320 ldpi (QVGA handset)</li> + <li>320x480 mdpi (handset)</li> + <li>480x800 hdpi (high density handset)</li> + </ul> + </li> + <li>480, for screens such as 480x800 mdpi (tablet/handset).</li> + <li>600, for screens such as 600x1024 mdpi (7" tablet).</li> + <li>720, for screens such as 720x1280 mdpi (10" tablet).</li> </ul> - <p><em>Added in API Level 13.</em></p> - <p>Also see the {@link android.content.res.Configuration#smallestScreenWidthDp} - configuration field, which holds the current smallest screen width.</p> + <p>When your application provides multiple resource directories with different values for + this qualifier, the system uses the one closest to (without exceeding) the smallest width + for the available space. </p> + <p><em>Added in API level 13.</em></p> + <p>Also see the <a + href="{@docRoot}guide/topics/manifest/supports-screens-element.html#requiresSmallest">{@code + android:requiresSmallestWidthDp}</a> attribute, which declares the smallest available width + with which your application is compatible, and the {@link + android.content.res.Configuration#smallestScreenWidthDp} configuration field, which holds + the current smallest screen width for the device.</p> </td> </tr> <tr id="ScreenWidthQualifier"> <td>Screen width</td> - <td>Examples:<br/> + <td><code>w<N>dp</code><br/><br/> + Examples:<br/> <code>w720dp</code><br/> <code>w1024dp</code><br/> etc. </td> <td> - <p>Specifies a minimum screen width, in "dp" units, at which the resource - should be used. This configuration value will change when the orientation - changes between landscape and portrait to match the current actual width. - When multiple screen width configurations are available, the closest to - the current screen width will be used. The - value here takes into account screen decorations so if the device has some - persistent UI elements on the left or right edge of the display it must - present a value here that is smaller than the real screen size, accounting - for these UI elements reducing the application's available space.</p> - <p><em>Added in API Level 13.</em></p> + <p>Specifies a minimum screen width, in {@code dp} units at which the resource + should be used—defined by the <code><N></code> value. This + configuration value will change when the orientation + changes between landscape and portrait to match the current actual width.</p> + <p>When your application provides multiple resource directories with different values + for this configuration, the system uses the one closest to (without exceeding) + the device's current screen width. The + value here takes into account screen decorations, so if the device has some + persistent UI elements on the left or right edge of the display, it + uses a value for the width that is smaller than the real screen size, accounting + for these UI elements and reducing the application's available space.</p> + <p><em>Added in API level 13.</em></p> <p>Also see the {@link android.content.res.Configuration#screenWidthDp} configuration field, which holds the current screen width.</p> </td> </tr> <tr id="ScreenHeightQualifier"> <td>Screen height</td> - <td>Examples:<br/> + <td><code>h<N>dp</code><br/><br/> + Examples:<br/> <code>h720dp</code><br/> <code>h1024dp</code><br/> etc. </td> <td> - <p>Specifies a minimum screen height, in "dp" units, at which the resource - should be used. This configuration value will change when the orientation - changes between landscape and portrait to match the current actual height. - When multiple screen height configurations are available, the closest to - the current screen height will be used. The - value here takes into account screen decorations so if the device has some - persistent UI elements on the left or right edge of the display it must - present a value here that is smaller than the real screen size, accounting - for these UI elements reducing the application's available space. Screen + <p>Specifies a minimum screen height, in "dp" units at which the resource + should be used—defined by the <code><N></code> value. This + configuration value will change when the orientation + changes between landscape and portrait to match the current actual height.</p> + <p>When your application provides multiple resource directories with different values + for this configuration, the system uses the one closest to (without exceeding) + the device's current screen height. The + value here takes into account screen decorations, so if the device has some + persistent UI elements on the top or bottom edge of the display, it uses + a value for the height that is smaller than the real screen size, accounting + for these UI elements and reducing the application's available space. Screen decorations that are not fixed (such as a phone status bar that can be hidden when full screen) are <em>not</em> accounted for here, nor are - window decorations like title bar, so applications must be prepared to + window decorations like the title bar or action bar, so applications must be prepared to deal with a somewhat smaller space than they specify. - <p><em>Added in API Level 13.</em></p> + <p><em>Added in API level 13.</em></p> <p>Also see the {@link android.content.res.Configuration#screenHeightDp} configuration field, which holds the current screen width.</p> </td> @@ -444,9 +465,9 @@ indicates the current locale.</p> 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> + be tablet-style devices. <em>Added in API level 9.</em></li> </ul> - <p><em>Added in API Level 4.</em></p> + <p><em>Added in API level 4.</em></p> <p>See <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a> for more information.</p> <p>Also see the {@link android.content.res.Configuration#screenLayout} configuration field, @@ -465,7 +486,7 @@ or large.</p> <li>{@code long}: Long screens, such as WQVGA, WVGA, FWVGA</li> <li>{@code notlong}: Not long screens, such as QVGA, HVGA, and VGA</li> </ul> - <p><em>Added in API Level 4.</em></p> + <p><em>Added in API level 4.</em></p> <p>This is based purely on the aspect ratio of the screen (a "long" screen is wider). This is not related to the screen orientation.</p> <p>Also see the {@link android.content.res.Configuration#screenLayout} configuration field, @@ -503,7 +524,7 @@ which indicates the current device orientation.</p> <li>{@code car}: Device is in a car dock</li> <li>{@code desk}: Device is in a desk dock</li> </ul> - <p><em>Added in API Level 8.</em></p> + <p><em>Added in API level 8.</em></p> <p>This can change during the life of your application if the user places the device in a dock. You can enable or disable this mode using {@link android.app.UiModeManager}. See <a href="runtime-changes.html">Handling Runtime Changes</a> for @@ -521,7 +542,7 @@ information about how this affects your application during runtime.</p> <li>{@code night}: Night time</li> <li>{@code notnight}: Day time</li> </ul> - <p><em>Added in API Level 8.</em></p> + <p><em>Added in API level 8.</em></p> <p>This can change during the life of your application if night mode is left in auto mode (default), in which case the mode changes based on the time of day. You can enable or disable this mode using {@link android.app.UiModeManager}. See <a @@ -549,7 +570,7 @@ Level 8</em></li> <li>{@code nodpi}: This can be used for bitmap resources that you do not want to be scaled to match the device density.</li> </ul> - <p><em>Added in API Level 4.</em></p> + <p><em>Added in API level 4.</em></p> <p>There is thus a 3:4:6:8 scaling ratio between the four densities, so a 9x9 bitmap in ldpi is 12x12 in mdpi, 18x18 in hdpi and 24x24 in xhdpi.</p> <p>When Android selects which resource files to use, @@ -689,17 +710,17 @@ orientation" described above.</p> </tr> --> <tr id="VersionQualifier"> - <td>Platform Version (API Level)</td> + <td>Platform Version (API level)</td> <td>Examples:<br/> <code>v3</code><br/> <code>v4</code><br/> <code>v7</code><br/> etc.</td> <td> - <p>The API Level supported by the device. For example, <code>v1</code> for API Level -1 (devices with Android 1.0 or higher) and <code>v4</code> for API Level 4 (devices with Android + <p>The API level supported by the device. For example, <code>v1</code> for API level +1 (devices with Android 1.0 or higher) and <code>v4</code> for API level 4 (devices with Android 1.6 or higher). See the <a -href="{@docRoot}guide/appendix/api-levels.html">Android API Levels</a> document for more information +href="{@docRoot}guide/appendix/api-levels.html">Android API levels</a> document for more information about these values.</p> <p class="caution"><strong>Caution:</strong> Android 1.5 and 1.6 only match resources with this qualifier when it exactly matches the platform version. See the section below about <a @@ -863,7 +884,7 @@ cannot use the resources named with the new qualifier. For example, if your <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code minSdkVersion}</a> is set to 4, and you qualify all of your drawable resources using <a href="#NightQualifier">night mode</a> ({@code night} or {@code notnight}, which were added in API -Level 8), then an API Level 4 device cannot access your drawable resources and will crash. In this +Level 8), then an API level 4 device cannot access your drawable resources and will crash. In this case, you probably want {@code notnight} to be your default resources, so you should exclude that qualifier so your drawable resources are in either {@code drawable/} or {@code drawable-night/}.</p> @@ -896,7 +917,7 @@ compatibility for these versions.</p> <dd>{@code long} and {@code notlong}</dd> </dl> -<p>These configuration qualifiers were introduced in Android 1.6, so Android 1.5 (API Level 3) and +<p>These configuration qualifiers were introduced in Android 1.6, so Android 1.5 (API level 3) and lower does not support them. If you use these configuration qualifiers and do not provide corresponding default resources, then an Android 1.5 device might use any one of the resource directories named with the above screen configuration qualifiers, because it ignores these @@ -926,9 +947,9 @@ is r6 or greater. <p>You need SDK Tools, Revision 6 (or greater), because it includes a new packaging tool that automatically applies an appropriate <a href="#VersionQualifier">version qualifier</a> to any resource directory named with a qualifier that does not exist in Android 1.0. For example, because -the density qualifier was introduced in Android 1.6 (API Level 4), when the packaging tool +the density qualifier was introduced in Android 1.6 (API level 4), when the packaging tool encounters a resource directory using the density qualifier, it adds {@code v4} to the directory -name to ensure that older versions do not use those resources (only API Level 4 and higher support +name to ensure that older versions do not use those resources (only API level 4 and higher support that qualifier). Thus, by putting your medium-density resources in a directory <em>without</em> the {@code mdpi} qualifier, they are still accessible by Android 1.5, and any device that supports the density qualifer and has a medium-density screen also uses the default resources (which are mdpi) @@ -937,7 +958,7 @@ resources).</p> </li> </ol> -<p class="note"><strong>Note:</strong> Later versions of Android, such as API Level 8, +<p class="note"><strong>Note:</strong> Later versions of Android, such as API level 8, introduce other configuration qualifiers that older version do not support. To provide the best compatibility, you should always include a set of default resources for each type of resource that your application uses, as discussed above to provide the best device compatibility.</p> @@ -1068,7 +1089,7 @@ href="accessing-resources.html">Accessing Resources</a>.</p> <p>The correct behavior is for the system to match resources marked with a <a href="#VersionQualifier">version qualifier</a> equal -to or less than the platform version on the device, but on Android 1.5 and 1.6, (API Level 3 and 4), +to or less than the platform version on the device, but on Android 1.5 and 1.6, (API level 3 and 4), there is a bug that causes the system to match resources marked with the version qualifier only when it exactly matches the version on the device.</p> diff --git a/docs/html/guide/topics/search/index.jd b/docs/html/guide/topics/search/index.jd index 7ac5ff1..218511b 100644 --- a/docs/html/guide/topics/search/index.jd +++ b/docs/html/guide/topics/search/index.jd @@ -52,7 +52,13 @@ example of the search dialog with optional search suggestions.</p> <p class="note"><strong>Note</strong>: The search framework does <em>not</em> provide APIs to search your data. To perform a search, you need to use APIs appropriate for your data. For example, if your data is stored in an SQLite database, you should use the {@link android.database.sqlite} -APIs to perform searches.</p> +APIs to perform searches. +<br/><br/> +Also, there is no guarantee that every device provides a dedicated SEARCH button to invoke the +search interface in your application. When using the search dialog or a custom interface, you +must always provide a search button in your UI that activates the search interface. For more +information, see <a href="search-dialog.html#InvokingTheSearchDialog">Invoking the search +dialog</a>.</p> <p>The following documents show you how to use Android's framework to implement search:</p> diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd index af6c8f2..d869a44 100644 --- a/docs/html/guide/topics/search/search-dialog.jd +++ b/docs/html/guide/topics/search/search-dialog.jd @@ -17,29 +17,30 @@ access</li> <h2>In this document</h2> <ol> -<li><a href="#TheBasics">The Basics</a></li> -<li><a href="#SearchableConfiguration">Creating a Searchable Configuration</a></li> -<li><a href="#SearchableActivity">Creating a Searchable Activity</a> - <ol> - <li><a href="#DeclaringSearchableActivity">Declaring a searchable activity</a></li> - <li><a href="#EnableSearch">Enabling the search dialog and search widget</a></li> - <li><a href="#PerformingSearch">Performing a search</a></li> - </ol> -</li> -<li><a href="#UsingTheSearchDialog">Using the Search Dialog</a> - <ol> - <li><a href="#LifeCycle">The impact of the search dialog on your activity lifecycle</a></li> - <li><a href="#SearchContextData">Passing search context data</a></li> - </ol> -</li> -<li><a href="#UsingSearchWidget">Using the Search Widget</a> - <ol> - <li><a href="#ConfiguringWidget">Configuring the search widget</a></li> - <li><a href="#WidgetFeatures">Other search widget features</a></li> - </ol> -</li> -<li><a href="#VoiceSearch">Adding Voice Search</a></li> -<li><a href="#SearchSuggestions">Adding Search Suggestions</a></li> + <li><a href="#TheBasics">The Basics</a></li> + <li><a href="#SearchableConfiguration">Creating a Searchable Configuration</a></li> + <li><a href="#SearchableActivity">Creating a Searchable Activity</a> + <ol> + <li><a href="#DeclaringSearchableActivity">Declaring a searchable activity</a></li> + <li><a href="#PerformingSearch">Performing a search</a></li> + </ol> + </li> + <li><a href="#SearchDialog">Using the Search Dialog</a> + <ol> + <li><a href="#InvokingTheSearchDialog">Invoking the search dialog</a></li> + <li><a href="#LifeCycle">The impact of the search dialog on your activity lifecycle</a></li> + <li><a href="#SearchContextData">Passing search context data</a></li> + </ol> + </li> + <li><a href="#UsingSearchWidget">Using the Search Widget</a> + <ol> + <li><a href="#ConfiguringWidget">Configuring the search widget</a></li> + <li><a href="#WidgetFeatures">Other search widget features</a></li> + <li><a href="#UsingBoth">Using both the widget and the dialog</a></li> + </ol> + </li> + <li><a href="#VoiceSearch">Adding Voice Search</a></li> + <li><a href="#SearchSuggestions">Adding Search Suggestions</a></li> </ol> <h2>Key classes</h2> @@ -494,13 +495,13 @@ searches.</p> <h3 id="InvokingTheSearchDialog">Invoking the search dialog</h3> -<p>As mentioned above, the device SEARCH button and {@link android.app.Activity#onSearchRequested -onSearchRequested()} method will open the search dialog, as long as the current activity -has declared the searchable activity to use, as shown in the previous section.</p> +<p>As mentioned above, the device SEARCH button will open the search dialog as long as the current +activity has declared in the manifest the searchable activity to use.</p> -<p>However, you should not assume that a SEARCH button is available on the user's device. You -should always provide another search button in your UI that activates the search dialog by calling -{@link android.app.Activity#onSearchRequested()}.</p> +<p>However, some devices do not include a dedicated SEARCH button, so you should not assume that +it's always available. When using the search dialog, you must <strong>always provide another search +button in your UI</strong> that activates the search dialog by calling {@link +android.app.Activity#onSearchRequested()}.</p> <p>For instance, you should either provide a menu item in your <a href="{@docRoot}guide/topics/ui/menus.html#options-menu">Options Menu</a> or a button in your @@ -510,12 +511,6 @@ href="{@docRoot}shareables/search_icons.zip">search_icons.zip</a> file includes medium and high density screens, which you can use for your search menu item or button (low-density screens scale-down the hdpi image by one half). </p> -<!-- ... maybe this should go into the Creating Menus document .... -<p>If you chose to provide a shortcut key for the menu item, using {@link -android.view.MenuItem#setAlphabeticShortcut(char)}, then SearchManager.MENU_KEY is the recommended -key character, representing the default search key.</p> ---> - <p>You can also enable "type-to-search" functionality, which activates the search dialog when the user starts typing on the keyboard—the keystrokes are inserted into the search dialog. You can enable type-to-search in your activity by calling diff --git a/docs/html/guide/topics/usb/adk.jd b/docs/html/guide/topics/usb/adk.jd index 2e172f5..b5a3f30 100644 --- a/docs/html/guide/topics/usb/adk.jd +++ b/docs/html/guide/topics/usb/adk.jd @@ -326,7 +326,7 @@ page.title=Android Open Accessory Development Kit <li>To open the firmware code (a sketch), click <strong>File > Open</strong> and select <code>firmware/demokit/demokit.pde</code>.</li> - <li>Click <strong>Sketch > Compile/Verify</strong> to ensure that the sketch has no + <li>Click <strong>Sketch > Verify/Compile</strong> to ensure that the sketch has no errors.</li> <li>Select <strong>File > Upload to I/O Board</strong>. When Arduino outputs <strong>Done @@ -356,7 +356,8 @@ page.title=Android Open Accessory Development Kit <li>In the <strong>Project name:</strong> field, type DemoKit.</li> <li>Choose <strong>Create project from existing source</strong>, click <strong>Browse</strong>, - select the <code>app</code> directory, and click <strong>Finish</strong>.</li> + select the <code>app</code> directory, click <strong>Open</strong> to close that dialog and then + click <strong>Finish</strong>.</li> <li>For Build Target, select <strong>Google APIs</strong> (Platform 2.3.3, API Level 10). diff --git a/docs/html/index.jd b/docs/html/index.jd index eeeedd0..dce46f9 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -148,19 +148,18 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more »</ 'tv': { 'layout':"imgLeft", - 'icon':"tv_s.png", + 'icon':"GTV_icon_small.png", 'name':"Google TV", - 'img':"tv_l.png", - 'title':"Announcing Google TV!", - 'desc': "<p><a href='http://www.google.com/tv/'>Google TV</a> is a new platform " - + "for television built on Android. Google " - + "has partnered with Sony and Logitech to integrate " - + "this platform into TVs, blu-ray players, and companion " - + "boxes. </p>" - + "<p><a href='http://www.google.com/tv/'>Learn more about " - + "Google TV »</a></p>" + 'img':"GTV_icon_large.png", + 'title':"Google TV!", + 'desc': "<p>Build something big. By big, we mean <em>worthy-of-the-living-room</em> big.</p>" + + " <p>Use <a href='http://code.google.com/tv'>Google TV</a> to bring the power of Android" + + " and Google Chrome to television." + + " The average American watches five hours of TV per day. Give them the web and apps" + + " to update their status, listen to music, watch web videos, and much more...</p>" }, + 'devphone': { 'layout':"imgLeft", 'icon':"devphone-small.png", diff --git a/docs/html/resources/dashboard/opengl.jd b/docs/html/resources/dashboard/opengl.jd index dac8ce5..3fcfa89 100644 --- a/docs/html/resources/dashboard/opengl.jd +++ b/docs/html/resources/dashboard/opengl.jd @@ -57,7 +57,7 @@ ending on the data collection date noted below.</p> <div class="dashboard-panel"> <img alt="" width="400" height="250" -src="http://chart.googleapis.com/chart?cht=p&chs=400x250&chco=c4df9b,6fad0c&chl=GL%20ES%201.1|GL%20ES%202.0&chd=t%3A8.9,91.1" /> +src="http://chart.googleapis.com/chart?cht=p&chs=400x250&chco=c4df9b,6fad0c&chl=GL%201.1|GL%202.0%20%26%201.1&chd=t%3A8.9,91" /> <table> <tr> @@ -66,11 +66,11 @@ src="http://chart.googleapis.com/chart?cht=p&chs=400x250&chco=c4df9b,6fad0c&chl= </tr> <tr> <td>1.1</th> -<td>8.9%</td> +<td>9%</td> </tr> <tr> <td>2.0</th> -<td>91.1%</td> +<td>91%</td> </tr> </table> diff --git a/docs/html/resources/dashboard/platform-versions.jd b/docs/html/resources/dashboard/platform-versions.jd index 368164d..d9adb36 100644 --- a/docs/html/resources/dashboard/platform-versions.jd +++ b/docs/html/resources/dashboard/platform-versions.jd @@ -51,8 +51,8 @@ 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:2.3,3.0,24.5,65.9,1.0,3.0,0.3&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" /> +<img alt="" height="250" width="470" +src="http://chart.apis.google.com/chart?&cht=p&chs=460x250&chd=t:1.4,2.2,17.5,59.4,1.0,17.6,0.4,0.5&chl=Android%201.5|Android%201.6|Android%202.1|Android%202.2|Android%202.3%20-%202.3.2|Android%202.3.3%20-%202.3.4|Android%203.0|Android%203.1&chco=c4df9b,6fad0c" /> <table> <tr> @@ -60,16 +60,19 @@ src="http://chart.apis.google.com/chart?&cht=p&chs=460x250&chd=t:2.3,3.0,24.5,65 <th>API Level</th> <th>Distribution</th> </tr> -<tr><td>Android 1.5</td><td>3</td><td>2.3%</td></tr> -<tr><td>Android 1.6</td><td>4</td><td>3.0%</td></tr> -<tr><td>Android 2.1</td><td>7</td><td>24.5%</td></tr> -<tr><td>Android 2.2</td><td>8</td><td>65.9%</td></tr> -<tr><td>Android 2.3</td><td>9</td><td>1.0%</td></tr> -<tr><td>Android 2.3.3</td><td>10</td><td>3.0%</td></tr> -<tr><td>Android 3.0</td><td>11</td><td>0.3%</td></tr> +<tr><td>Android 1.5</td><td>3</td><td>1.4%</td></tr> +<tr><td>Android 1.6</td><td>4</td><td>2.2%</td></tr> +<tr><td>Android 2.1</td><td>7</td><td>17.5%</td></tr> +<tr><td>Android 2.2</td><td>8</td><td>59.4%</td></tr> +<tr><td>Android 2.3 -<br/> + Android 2.3.2</td><td>9</td><td>1%</td></tr> +<tr><td>Android 2.3.3 -<br/> + Android 2.3.4</td><td>10</td><td>17.6%</td></tr> +<tr><td>Android 3.0</td><td>11</td><td>0.4%</td></tr> +<tr><td>Android 3.1</td><td>12</td><td>0.5%</td></tr> </table> -<p><em>Data collected during two weeks ending on May 2, 2011</em></p> +<p><em>Data collected during a 14-day period ending on July 5, 2011</em></p> <!-- <p style="font-size:.9em">* <em>Other: 0.1% of devices running obsolete versions</em></p> --> @@ -98,9 +101,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%7C11/01%7C11/15%7C12/01%7C12/15%7C01/01%7C01/15%7C02/01%7C02/15%7C03/01%7C03/15%7C04/01%7C04/15%7C05/01%7C1%3A%7C2010%7C%7C%7C%7C2011%7C%7C%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:100.0,99.9,99.8,99.7,100.0,99.9,99.9,99.9,100.0,99.8,99.7,99.6,99.6|92.0,92.7,93.4,94.1,95.2,95.6,96.0,96.3,96.7,96.8,97.0,97.1,97.3|77.4,79.6,82.2,84.4,87.2,88.3,89.7,90.5,91.5,92.0,93.5,93.9,94.3|37.1,40.5,44.3,47.7,51.8,54.3,58.3,59.7,61.5,63.0,66.4,68.0,69.8|0.0,0.0,0.0,0.0,0.4,0.6,0.7,0.8,1.1,1.7,2.5,3.1,4.0|0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,0.0,1.0,1.7,2.2,3.0&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" /> +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%7C01/01%7C01/15%7C02/01%7C02/15%7C03/01%7C03/15%7C04/01%7C04/15%7C05/01%7C05/15%7C06/01%7C06/15%7C07/01%7C1%3A%7C2011%7C%7C%7C%7C%7C%7C%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:100.0,99.9,99.9,99.9,100.0,99.8,99.7,99.6,99.6,99.5,99.4,99.3,99.2|95.2,95.6,96.0,96.3,96.7,96.8,97.0,97.1,97.3,97.5,97.5,97.5,97.7|87.2,88.3,89.7,90.5,91.5,92.0,93.5,93.9,94.3,94.8,95.0,95.2,95.5|51.8,54.3,58.3,59.7,61.5,63.0,66.4,68.0,69.8,71.5,73.9,75.4,77.6|0.4,0.6,0.7,0.8,1.1,1.7,2.5,3.1,4.0,6.1,9.5,13.6,17.8|0.0,0.0,0.0,0.0,0.0,1.0,1.7,2.2,3.0,5.1,8.4,12.6,16.8&chm=b,c3df9b,0,1,0|b,b4db77,1,2,0|tAndroid 2.1,547a19,2,0,15,,t::-5|b,a5db51,2,3,0|tAndroid2.2,3f5e0e,3,0,15,,t::-5|b,96dd28,3,4,0|b,83c916,4,5,0|tAndroid2.3.3,131d02,5,11,15,,t::-5|B,6fad0c,5,6,0&chg=7,25&chdl=Android 1.5|Android 1.6|Android 2.1|Android2.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 May 2, 2011</em></p> +<p><em>Last historical dataset collected during a 14-day period ending on July 5, 2011</em></p> </div><!-- end dashboard-panel --> diff --git a/docs/html/resources/dashboard/screens.jd b/docs/html/resources/dashboard/screens.jd index bdaae0d..e61e799 100644 --- a/docs/html/resources/dashboard/screens.jd +++ b/docs/html/resources/dashboard/screens.jd @@ -60,7 +60,7 @@ ending on the data collection date noted below.</p> <div class="dashboard-panel"> <img alt="" width="400" height="250" -src="http://chart.googleapis.com/chart?cht=p&chs=400x250&chco=c4df9b,6fad0c&chl=xlarge%20/%20mdpi|large%20/%20mdpi|normal%20/%20hdpi|normal%20/%20ldpi|normal%20/%20mdpi|small%20/%20hdpi&chd=t%3A0.5,2.6,75.5,1.2,17.1,3.2" /> +src="http://chart.googleapis.com/chart?cht=p&chs=400x250&chco=c4df9b,6fad0c&chl=Xlarge%20/%20mdpi|Large%20/%20mdpi|Normal%20/%20hdpi|Normal%20/%20ldpi|Normal%20/%20mdpi|Small%20/%20hdpi&chd=t%3A0.9,2.8,75,1.0,17,3.3" /> <table> <tr> @@ -71,31 +71,31 @@ src="http://chart.googleapis.com/chart?cht=p&chs=400x250&chco=c4df9b,6fad0c&chl= <th scope="col">xhdpi</th> </tr> <tr><th scope="row">small</th> -<td></td> <!-- ldpi --> -<td></td> <!-- mdpi --> -<td>3.2%</td> <!-- hdpi --> -<td></td> <!-- xhdpi --> +<td></td> <!-- small/ldpi --> +<td></td> <!-- small/mdpi --> +<td>3.3%</td> <!-- small/hdpi --> +<td></td> <!-- small/xhdpi --> </tr> <tr><th scope="row">normal</th> -<td>1.2%</td> <!-- ldpi --> -<td>17.1%</td> <!-- mdpi --> -<td>75.5%</td> <!-- hdpi --> -<td></td> <!-- xhdpi --> +<td>1%</td> <!-- normal/ldpi --> +<td>17%</td> <!-- normal/mdpi --> +<td>75%</td> <!-- normal/hdpi --> +<td></td> <!-- normal/xhdpi --> </tr> <tr><th scope="row">large</th> -<td></td> <!-- ldpi --> -<td>2.6%</td> <!-- mdpi --> -<td></td> <!-- hdpi --> -<td></td> <!-- xhdpi --> +<td></td> <!-- large/ldpi --> +<td>2.8%</td> <!-- large/mdpi --> +<td></td> <!-- large/hdpi --> +<td></td> <!-- large/xhdpi --> </tr> <tr><th scope="row">xlarge</th> -<td></td> <!-- ldpi --> -<td>0.5%</td> <!-- mdpi --> -<td></td> <!-- hdpi --> -<td></td> <!-- xhdpi --> +<td></td> <!-- xlarge/ldpi --> +<td>0.9%</td> <!-- xlarge/mdpi --> +<td></td> <!-- xlarge/hdpi --> +<td></td> <!-- xlarge/xhdpi --> </tr> </table> -<p><em>Data collected during a 7-day period ending on May 6, 2011</em></p> +<p><em>Data collected during a 7-day period ending on July 1, 2011</em></p> </div> diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js index e8c9ae7..0fc10bf 100644 --- a/docs/html/resources/resources-data.js +++ b/docs/html/resources/resources-data.js @@ -726,6 +726,16 @@ var ANDROID_RESOURCES = [ en: 'Binding data to views using XML Adapters examples.' } }, + { + tags: ['sample', 'new', 'accessibility'], + path: 'samples/TtsEngine/index.html', + title: { + en: 'Text To Speech Engine' + }, + description: { + en: 'An example Text To Speech engine written using the android text to speech engine API.' + } + }, ///////////////// /// TUTORIALS /// diff --git a/docs/html/resources/tutorials/views/hello-spinner.jd b/docs/html/resources/tutorials/views/hello-spinner.jd index 7a3a9c3..e9dc20f 100644 --- a/docs/html/resources/tutorials/views/hello-spinner.jd +++ b/docs/html/resources/tutorials/views/hello-spinner.jd @@ -105,7 +105,7 @@ public class MyOnItemSelectedListener implements OnItemSelectedListener { public void onItemSelected(AdapterView<?> parent, View view, int pos, long id) { - Toast.makeText(parent.getContext()), "The planet is " + + Toast.makeText(parent.getContext(), "The planet is " + parent.getItemAtPosition(pos).toString(), Toast.LENGTH_LONG).show(); } diff --git a/docs/html/sdk/android-3.1-highlights.jd b/docs/html/sdk/android-3.1-highlights.jd index 3d132a3..88bc1ee 100644 --- a/docs/html/sdk/android-3.1-highlights.jd +++ b/docs/html/sdk/android-3.1-highlights.jd @@ -143,8 +143,8 @@ point, select, drag, scroll, hover, and other standard actions.</p> <p>To make the platform even better for gaming, Android 3.1 adds support for most PC joysticks and gamepads that are connected over USB or Bluetooth HID.</p> -<p>For example, users can connect Sony Playstation™ 3 and XBox 360™ game -controllers over USB (but not Bluetooth), Logitech Dual Action™ gamepads and +<p>For example, users can connect PlayStation<sup>®</sup>3 and Xbox 360<sup>®</sup> +game controllers over USB (but not Bluetooth), Logitech Dual Action™ gamepads and flight sticks, or a car racing controller. Game controllers that use proprietary networking or pairing are not supported by default, but in general, the platform supports most PC-connectible joysticks and gamepads.</p> diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd index 935bf63..18f47a6 100644 --- a/docs/html/sdk/eclipse-adt.jd +++ b/docs/html/sdk/eclipse-adt.jd @@ -1,8 +1,8 @@ page.title=ADT Plugin for Eclipse -adt.zip.version=11.0.0 -adt.zip.download=ADT-11.0.0.zip -adt.zip.bytes=TODO -adt.zip.checksum=TODO +adt.zip.version=12.0.0 +adt.zip.download=ADT-12.0.0.zip +adt.zip.bytes=5651973 +adt.zip.checksum=8ad85d0f3da4a2b8dadfddcc2d66dbcb @jd:body @@ -95,13 +95,64 @@ padding: .25em 1em; </style> - <div class="toggleable opened"> <a href="#" onclick="return toggleDiv(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" /> +ADT 12.0.0</a> <em>(July 2011)</em> + <div class="toggleme"> +<dl> + +<dt>Dependencies:</dt> + +<dd>ADT 12.0.0 is designed for use with <a href="{@docRoot}sdk/tools-notes.html">SDK Tools r12</a>. If you haven't +already installed SDK Tools r12 into your SDK, use +the Android SDK and AVD Manager to do so.</dd> + +<dt>Visual Layout Editor:</dt> +<dd> +<ul> + <li>New RelativeLayout drop support with guideline suggestions for + attachments and cycle prevention + (<a href="http://tools.android.com/recent/revampedrelativelayoutsupport">more info</a>).</li> + <li>Resize support in most layouts along with + guideline snapping to the sizes dictated by <code>wrap_content</code> and <code>match_parent</code>. + In LinearLayout, sizes are mapped to weights instead of pixel widths. + (<a href="http://tools.android.com/recent/resizesupport">more info</a>).</li> + <li>Previews of drawables and colors in the resource chooser dialogs + (<a href="http://tools.android.com/recent/imageandcolorpreviews">more info</a>).</li> + <li>Improved error messages and links for rendering errors including + detection of misspelled class names + (<a href="http://tools.android.com/recent/improvedrenderingerrordiagnostics">more info</a>).</li> +</ul> +</dd> + +<dt>Build system</dt> +<dd> +<ul> + <li>A new option lets you disable the packaging step in the automatic + builders. This improves performance when saving files by not + performing a full build, which can take a long time for large projects. + If the option is enabled, the APK is packaged when the + application is deployed to a device or emulator or when the + release APK is exported (<a href="http://tools.android.com/recent/finercontroloveradtbuildprocess">more info</a>).</li> +</ul> +</dd> + +<dt>Bug fixes</dt> +<dd>Many bug fixes are part of this release +(<a href="http://tools.android.com/recent/adt12bugfixroundup">more info</a>).</dd> + +</div> +</div> + + +<div class="toggleable closed"> + <a href="#" onclick="return toggleDiv(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" +width="9px" /> ADT 11.0.0</a> <em>(June 2011)</em> - <dd class="toggleme"> + <div class="toggleme"> <dl> @@ -229,6 +280,9 @@ href="http://tools.android.com/recent">Android Tools Project Site</a>.</p> </div> + + + <div class="toggleable closed"> <a href="#" onclick="return toggleDiv(this)"> <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index e7b8fbb..5cf37c1 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -1,21 +1,21 @@ page.title=Android SDK sdk.redirect=0 -sdk.win_installer=installer_r11-windows.exe -sdk.win_installer_bytes=32883649 -sdk.win_installer_checksum=3dc8a29ae5afed97b40910ef153caa2b +sdk.win_installer=installer_r12-windows.exe +sdk.win_installer_bytes=36531492 +sdk.win_installer_checksum=367f0ed4ecd70aefc290d1f7dcb578ab -sdk.win_download=android-sdk_r11-windows.zip -sdk.win_bytes=32837554 -sdk.win_checksum=0a2c52b8f8d97a4871ce8b3eb38e3072 +sdk.win_download=android-sdk_r12-windows.zip +sdk.win_bytes=36486190 +sdk.win_checksum=8d6c104a34cd2577c5506c55d981aebf -sdk.mac_download=android-sdk_r11-mac_x86.zip -sdk.mac_bytes=28844968 -sdk.mac_checksum=85bed5ed25aea51f6a447a674d637d1e +sdk.mac_download=android-sdk_r12-mac_x86.zip +sdk.mac_bytes=30231118 +sdk.mac_checksum=341544e4572b4b1afab123ab817086e7 -sdk.linux_download=android-sdk_r11-linux_x86.tgz -sdk.linux_bytes=26984929 -sdk.linux_checksum=026c67f82627a3a70efb197ca3360d0a +sdk.linux_download=android-sdk_r12-linux_x86.tgz +sdk.linux_bytes=30034243 +sdk.linux_checksum=f8485275a8dee3d1929936ed538ee99a @jd:body diff --git a/docs/html/sdk/oem-usb.jd b/docs/html/sdk/oem-usb.jd index 27e742a..3c2ba8b 100644 --- a/docs/html/sdk/oem-usb.jd +++ b/docs/html/sdk/oem-usb.jd @@ -80,6 +80,12 @@ href="http://www.kttech.co.kr/cscenter/download05.asp">http://www.kttech.co.kr/c <td><a href="http://www.kyocera-wireless.com/support/phone_drivers.htm">http://www.kyocera-wireless.com/support/phone_drivers.htm</a> </td> </tr> + <tr> + <td>Lenevo</td> + <td><a href="http://developer.lenovomm.com/developer/download.jsp" + >http://developer.lenovomm.com/developer/download.jsp</a> + </td> + </tr> <tr><td>LGE</td> <td><a href="http://www.lg.com/us/mobile-phones/mobile-support/mobile-lg-mobile-phone-support.jsp">http://www.lg.com/us/mobile-phones/mobile-support/mobile-lg-mobile-phone-support.jsp</a></td> </tr><tr><td>Motorola</td> <td><a diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs index d02c13d..0607aad 100644 --- a/docs/html/sdk/sdk_toc.cs +++ b/docs/html/sdk/sdk_toc.cs @@ -134,7 +134,7 @@ class="new">new!</span></li> </li> </ul> <ul> - <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r11</a> <span + <li><a href="<?cs var:toroot ?>sdk/tools-notes.html">SDK Tools, r12</a> <span class="new">new!</span></li> <li><a href="<?cs var:toroot ?>sdk/win-usb.html">Google USB Driver, r4</a></li> <li><a href="<?cs var:toroot ?>sdk/compatibility-library.html">Compatibility Library, r2</a> <span @@ -153,7 +153,7 @@ class="new">new!</span></li> <span style="display:none" class="zh-TW"></span> </h2> <ul> - <li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 11.0.0 + <li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 12.0.0 <span style="display:none" class="de"></span> <span style="display:none" class="es"></span> <span style="display:none" class="fr"></span> diff --git a/docs/html/sdk/tools-notes.jd b/docs/html/sdk/tools-notes.jd index 64c8f2a..8c4d037 100644 --- a/docs/html/sdk/tools-notes.jd +++ b/docs/html/sdk/tools-notes.jd @@ -62,9 +62,36 @@ padding: .25em 1em; } </style> + <div class="toggleable opened"> <a href="#" onclick="return toggleDiv(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" /> +SDK Tools, Revision 12</a> <em>(July 2011)</em> + <div class="toggleme"> + <dl> +<dt>Dependencies:</dt> +<dd> +<p>If you are developing in Eclipse with ADT, note that the SDK Tools r12 is designed for use with +ADT 12.0.0 and later. If you haven't already, we highly recommend updating your <a +href="{@docRoot}sdk/eclipse-adt.html">ADT Plugin</a> to 12.0.0.</p> + +<p>If you are developing outside Eclipse, you must have <a href="http://ant.apache.org/">Apache +Ant</a> 1.8 or later.</p> + +<dt>General notes:</dt> +<dd> + <ul> + <li>The AVD manager and emulator can now use system images + compiled for ARM v7 and x86 CPUs.</li> + </ul> +</dd> +</dl> +</div> +</div> + +<div class="toggleable closed"> + <a href="#" onclick="return toggleDiv(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px" width="9px" /> SDK Tools, Revision 11</a> <em>(May 2011)</em> <div class="toggleme"> <dl> |