diff options
Diffstat (limited to 'docs')
57 files changed, 197 insertions, 297 deletions
diff --git a/docs/html/guide/appendix/app-intents.jd b/docs/html/guide/appendix/app-intents.jd index 102183b..110196c 100644 --- a/docs/html/guide/appendix/app-intents.jd +++ b/docs/html/guide/appendix/app-intents.jd @@ -97,7 +97,7 @@ page.title=Reference of Available Intents the fisheye lens effect that would be present if a 90 degree horizontal FOV was used in portrait mode.</td></tr> <tr><td>mapZoom</td><td>The map zoom of the map location associated with this panorama. This value is passed on to the - Maps activity when the Street View "Go to Maps" menu item is chosen. It corresponds to the <em>z</em> paramaeter in + Maps activity when the Street View "Go to Maps" menu item is chosen. It corresponds to the <em>z</em> parameter in the geo: intent.</td></tr> </table> </td> diff --git a/docs/html/guide/appendix/faq/commontasks.jd b/docs/html/guide/appendix/faq/commontasks.jd index 107199a..38a89ef 100644 --- a/docs/html/guide/appendix/faq/commontasks.jd +++ b/docs/html/guide/appendix/faq/commontasks.jd @@ -326,7 +326,7 @@ loopback interface. <p>The listening classes, called broadcast receivers, extend {@link android.content.BroadcastReceiver BroadcastReceiver}. If you want Android to instantiate the object whenever an appropriate intent notification is sent, define the receiver with a <code><receiver></code> element - in the AndroidManifext.xml file. If the caller is expected to instantiate the + in the AndroidManifest.xml file. If the caller is expected to instantiate the object in preparation to receive a message, this is not required. The receiver will get a call to their {@link android.content.BroadcastReceiver#onReceive(android.content.Context,android.content.Intent) BroadcastReceiver.onReceive()} method. A receiver can define an <code><intent-filter></code> tag @@ -466,7 +466,7 @@ user receiving new e-mail.</p> }; -private void IncomingMotherInlawCall(Connection c) { +private void IncomingMotherInLawCall(Connection c) { String Text; // "Answer" callback. @@ -484,7 +484,7 @@ private void IncomingMotherInlawCall(Connection c) { new AlertDialog.Builder(this) .setMessage("Phyllis is calling") .setPositiveButton("Answer", acceptMsg) - .setOnCanceListener(new OnCancelListener() { + .setOnCancelListener(new OnCancelListener() { public void onCancel(DialogInterface dialog) { rejectMsg.sendToTarget(); }}); diff --git a/docs/html/guide/appendix/g-app-intents.jd b/docs/html/guide/appendix/g-app-intents.jd index d4f97c8..2846859 100644 --- a/docs/html/guide/appendix/g-app-intents.jd +++ b/docs/html/guide/appendix/g-app-intents.jd @@ -103,7 +103,7 @@ narrower than in landscape mode. This is done to minimize the fisheye lens effect that would be present if a 90 degree horizontal FOV was used in portrait mode.</td></tr> <tr><td><em>mapZoom</em></td><td>The map zoom of the map location associated with this panorama. This value is passed on to the - Maps activity when the Street View "Go to Maps" menu item is chosen. It corresponds to the <em>z</em> paramaeter in + Maps activity when the Street View "Go to Maps" menu item is chosen. It corresponds to the <em>z</em> parameter in the geo: intent.</td></tr> </table> </td> diff --git a/docs/html/guide/appendix/glossary.jd b/docs/html/guide/appendix/glossary.jd index ef81631..97669ba 100644 --- a/docs/html/guide/appendix/glossary.jd +++ b/docs/html/guide/appendix/glossary.jd @@ -167,7 +167,7 @@ page.title=Glossary <dd>An XML file that each application must define, to describe the application's package name, version, components (activities, intent filters, services), imported libraries, and describes the various - activies, and so on. See <a + activities, and so on. See <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a> for complete information.</dd> diff --git a/docs/html/guide/developing/eclipse-adt.jd b/docs/html/guide/developing/eclipse-adt.jd index 667aa9f..c01745e 100644 --- a/docs/html/guide/developing/eclipse-adt.jd +++ b/docs/html/guide/developing/eclipse-adt.jd @@ -27,7 +27,7 @@ applications:</p> <ul> <li>It gives you access to other Android development tools from inside the Eclipse IDE. For example, ADT lets you access the many capabilities of the DDMS tool: take screenshots, manage -port-forwarding, set breakpoints, and view thread and process informationd irectly from Eclipse.</li> +port-forwarding, set breakpoints, and view thread and process information directly from Eclipse.</li> <li>It provides a New Project Wizard, which helps you quickly create and set up all of the basic files you'll need for a new Android application.</li> <li>It automates and simplifies the process of building your Android application.</li> @@ -145,7 +145,7 @@ create an AVD.</p> <p>If you will be running your applications only on actual device hardware, you do not need an AVD — see <a href="{@docRoot}guide/developing/device.html">Developing On a Device</a> for information -on running your applicaiton.</p> +on running your application.</p> <h3 id="CreatingAnAvd">Creating an AVD</h3> diff --git a/docs/html/guide/developing/other-ide.jd b/docs/html/guide/developing/other-ide.jd index 2080873..d043a7d 100644 --- a/docs/html/guide/developing/other-ide.jd +++ b/docs/html/guide/developing/other-ide.jd @@ -239,7 +239,7 @@ environment variable to specify the path to where the JDK is installed.</p> <p class="note"><strong>Note:</strong> When installing JDK on Windows, the default is to install in the "Program Files" directory. This location will cause <code>ant</code> to fail, because of the space. To fix the problem, you can specify the JAVA_HOME variable like this: -<code>set JAVA_HOME=c:\Prora~1\Java\<jdkdir></code>. The easiest solution, however, is to +<code>set JAVA_HOME=c:\Progra~1\Java\<jdkdir></code>. The easiest solution, however, is to install JDK in a non-space directory, for example: <code>c:\java\jdk1.6.0_02</code>.</p> diff --git a/docs/html/guide/developing/tools/adb.jd b/docs/html/guide/developing/tools/adb.jd index dd60a3c..04eed8e 100644 --- a/docs/html/guide/developing/tools/adb.jd +++ b/docs/html/guide/developing/tools/adb.jd @@ -94,7 +94,7 @@ Emulator 2, adb: 5557 ... <p>Once the server has set up connections to all emulator instances, you can use adb commands to control and access those instances. Because the server manages connections to emulator/device instances and handles commands from multiple adb clients, you can control any emulator/device instance from any client (or from a script).</p> -<p>The sections below describe the commands that you can use to access adb capabilities and manage the state of an emulator/device. Note that if you are developing Android applications in Eclipse and have installed the ADT plugin, you do not need to access adb from the command line. The ADT plugin provides a trasparent integration of adb into the Eclipse IDE. However, you can still use adb directly as necessary, such as for debugging.</p> +<p>The sections below describe the commands that you can use to access adb capabilities and manage the state of an emulator/device. Note that if you are developing Android applications in Eclipse and have installed the ADT plugin, you do not need to access adb from the command line. The ADT plugin provides a transparent integration of adb into the Eclipse IDE. However, you can still use adb directly as necessary, such as for debugging.</p> <a name="issuingcommands"></a> diff --git a/docs/html/guide/developing/tools/adt.jd b/docs/html/guide/developing/tools/adt.jd index 6eee91d..eb7ad4f 100644 --- a/docs/html/guide/developing/tools/adt.jd +++ b/docs/html/guide/developing/tools/adt.jd @@ -4,7 +4,7 @@ page.title=ADT Plugin <p>The Android Development Tools (ADT) plugin adds powerful extensions to the Eclipse integrated development environment. It allows you to create and debug your Android applications easier and faster. If you use Eclipse, the ADT plugin gives you an incredible boost in developing Android applications:</p> <ul> - <li>It gives you access to other Android development tools from inside the Eclipse IDE. For example, ADT lets you access the many capabilities of the DDMS tool: take screenshots, manage port-forwarding, set breakpoints, and view thread and process informationd irectly from Eclipse.</li> + <li>It gives you access to other Android development tools from inside the Eclipse IDE. For example, ADT lets you access the many capabilities of the DDMS tool: take screenshots, manage port-forwarding, set breakpoints, and view thread and process information directly from Eclipse.</li> <li>It provides a New Project Wizard, which helps you quickly create and set up all of the basic files you'll need for a new Android application.</li> <li>It automates and simplifies the process of building your Android application.</li> <li>It provides an Android code editor that helps you write valid XML for your Android manifest and resource files.</li> @@ -102,7 +102,7 @@ Note that to update your plugin, you will have to follow these steps again inste <p>Note that the "Android Editors" feature of ADT requires several optional Eclipse components (for example, WST). If you encounter an error when -installing ADT, your Eclipse installion might not include those components. +installing ADT, your Eclipse installation might not include those components. For information about how to quickly add the necessary components to your Eclipse installation, see the troubleshooting topic <a href="{@docRoot}resources/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p> diff --git a/docs/html/guide/developing/tools/aidl.jd b/docs/html/guide/developing/tools/aidl.jd index abfa8b1..19d9ea1 100644 --- a/docs/html/guide/developing/tools/aidl.jd +++ b/docs/html/guide/developing/tools/aidl.jd @@ -297,9 +297,9 @@ on how to keep your application secure from malware.</p> as method arguments. </li> </ul> <p>Here is some sample code demonstrating calling an AIDL-created service, taken - from the Remote Activity sample in the ApiDemos project.</p> -<p>{@sample development/samples/ApiDemos/src/com/example/android/apis/app/RemoteServiceBinding.java - exposing_a_service}</p> + from the Remote Service sample in the ApiDemos project.</p> +<p>{@sample development/samples/ApiDemos/src/com/example/android/apis/app/RemoteService.java + calling_a_service}</p> diff --git a/docs/html/guide/developing/tools/draw9patch.jd b/docs/html/guide/developing/tools/draw9patch.jd index f25fabb..9607ae7 100644 --- a/docs/html/guide/developing/tools/draw9patch.jd +++ b/docs/html/guide/developing/tools/draw9patch.jd @@ -5,7 +5,7 @@ page.title=Draw 9-patch {@link android.graphics.NinePatch} graphic using a WYSIWYG editor.</p> <p>For an introduction to Nine-patch graphics and how they work, please read the section on Nine-patch in the -<a href="{@docRoot}guide/topics/resources/available-resources.html#ninepatch">Ninepatch Images</a> topic.</p> +<a href="{@docRoot}guide/topics/resources/available-resources.html#ninepatch">Nine-patch Images</a> topic.</p> <div class="sidebox" style="width:auto"><br/> <img src="{@docRoot}images/draw9patch-norm.png" alt="" height="300" width="341" /> diff --git a/docs/html/guide/developing/tools/emulator.jd b/docs/html/guide/developing/tools/emulator.jd index 03a4d1e..507353e 100644 --- a/docs/html/guide/developing/tools/emulator.jd +++ b/docs/html/guide/developing/tools/emulator.jd @@ -1338,7 +1338,7 @@ B:10.0.2.15:<serverPort></code></li> <p>You can use the <code>power</code> command to control the simulated power state of the emulator instance.The usage for the command is: </p> -<pre>power <display|ac|status|present|health|capactiy></pre> +<pre>power <display|ac|status|present|health|capacity></pre> <p>The <code>event</code> command supports the subcommands listed in the table below. </p> @@ -1393,7 +1393,7 @@ B:10.0.2.15:<serverPort></code></li> <a name="netdelay"></a> <h3>Network Delay Emulation</h3> -<p>The emulator lets you simulate various network latency levels, so that you can test your applicaton in an environment more typical of the actual conditions in which it will run. You can set a latency level or range at emulator startup or you can use the console to change the latency dynamically, while the application is running in the emulator. </p> +<p>The emulator lets you simulate various network latency levels, so that you can test your application in an environment more typical of the actual conditions in which it will run. You can set a latency level or range at emulator startup or you can use the console to change the latency dynamically, while the application is running in the emulator. </p> <p>To set latency at emulator startup, use the <code>-netdelay</code> emulator option with a supported <code><delay></code> value, as listed in the table below. Here are some examples:</p> <pre>emulator -netdelay gprs emulator -netdelay 40 100</pre> diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 927c3fa..13d752a 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -143,7 +143,6 @@ <li><a href="<?cs var:toroot ?>guide/topics/manifest/intent-filter-element.html"><intent-filter></a></li> <li><a href="<?cs var:toroot ?>guide/topics/manifest/manifest-element.html"><manifest></a></li> <li><a href="<?cs var:toroot ?>guide/topics/manifest/meta-data-element.html"><meta-data></a></li> - <li><a href="<?cs var:toroot ?>guide/topics/manifest/path-permission-element.html"><path-permission></a></li> <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-element.html"><permission></a></li> <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-group-element.html"><permission-group></a></li> <li><a href="<?cs var:toroot ?>guide/topics/manifest/permission-tree-element.html"><permission-tree></a></li> diff --git a/docs/html/guide/practices/ui_guidelines/activity_task_design.jd b/docs/html/guide/practices/ui_guidelines/activity_task_design.jd index e2fc89c..6cd2199 100644 --- a/docs/html/guide/practices/ui_guidelines/activity_task_design.jd +++ b/docs/html/guide/practices/ui_guidelines/activity_task_design.jd @@ -469,7 +469,7 @@ page.title=Activity and Task Design Guidelines re-use activities in other applications, and how your activities might be re-used by other applications. If you add an activity with the same <a href=#intents title="intent filter">intent filter</a> as an - exisiting activity, then the system presents the user with a choice + existing activity, then the system presents the user with a choice between the activities. </p> @@ -879,7 +879,7 @@ page.title=Activity and Task Design Guidelines <p> You can either test that an activity matches the intent, which you can do before starting the activity, or catch an exception if starting the - activity fails. Both approaches are descibed in the blog posting + activity fails. Both approaches are described in the blog posting <a href="http://android-developers.blogspot.com/2009/01/can-i-use-this-intent.html">Can I use this Intent?</a>. </p> @@ -938,7 +938,7 @@ page.title=Activity and Task Design Guidelines the menus, the system compares the "Share" request (an Intent object) to available activities (by looking at their intent filters) and displays choices to share. In this case, it - matches Email, Gmail, Messaging and Picassa. If your activity + matches Email, Gmail, Messaging and Picasa. If your activity can send a picture or upload it to a website, all it needs to do is make itself available for sharing (by setting its intent filter). @@ -978,7 +978,7 @@ page.title=Activity and Task Design Guidelines <li> <b>Launch your activity <em>only</em> from within another application</b> - The previous cases of sharing by way of - Email, Gmail, Messaging and Picassa (from within Gallery) are + Email, Gmail, Messaging and Picasa (from within Gallery) are all activities that can also be started from icons in the application launcher at Home. In contrast, the activities for cropping a picture and attaching a file cannot be started from diff --git a/docs/html/guide/practices/ui_guidelines/widget_design.jd b/docs/html/guide/practices/ui_guidelines/widget_design.jd index 514b315..fc62fe6 100644 --- a/docs/html/guide/practices/ui_guidelines/widget_design.jd +++ b/docs/html/guide/practices/ui_guidelines/widget_design.jd @@ -9,7 +9,7 @@ page.title=Widget Design Guidelines <ul> <li>Widgets have six standard sizes on the Home screen</li> <li>Widgets have standards for size, frames, shadows, and file format, which you can copy</li> -<li>A few tricks make it easier to design widgets that fit graphically on the Home screeen</li> +<li>A few tricks make it easier to design widgets that fit graphically on the Home screen</li> </ul> <h2>In this document</h2> diff --git a/docs/html/guide/publishing/versioning.jd b/docs/html/guide/publishing/versioning.jd index 16fc356..1d55f8a 100644 --- a/docs/html/guide/publishing/versioning.jd +++ b/docs/html/guide/publishing/versioning.jd @@ -67,7 +67,7 @@ always define values for both of them: </p> <li><code>android:versionCode</code> — An integer value that represents the version of the application code, relative to other versions. -<p>The value is an integer so that other applications can programatically +<p>The value is an integer so that other applications can programmatically evaluate it, for example to check an upgrade or downgrade relationship. You can set the value to any integer you want, however you should make sure that each successive release of your application uses a greater value. The system does not @@ -78,7 +78,7 @@ normative. </p> versionCode set to 1, then monotonically increase the value with each release, regardless whether the release constitutes a major or minor release. This means that the <code>android:versionCode</code> value does not necessarily have a -strong resemblence to the application release version that is visible to the +strong resemblance to the application release version that is visible to the user (see <code>android:versionName</code>, below). Applications and publishing services should not display this version value to users.</p> </li> diff --git a/docs/html/guide/topics/appwidgets/index.jd b/docs/html/guide/topics/appwidgets/index.jd index cf606fd..f36b684 100644 --- a/docs/html/guide/topics/appwidgets/index.jd +++ b/docs/html/guide/topics/appwidgets/index.jd @@ -382,7 +382,7 @@ so the Activity needs to accept this Intent. For example:</p> <p>Also, the Activity must be declared in the AppWidgetProviderInfo XML file, with the <code>android:configure</code> attribute (see <a href="#MetaData">Adding -the AppWidgetProvierInfo Metadata</a> above). For example, the configuration Activity +the AppWidgetProviderInfo Metadata</a> above). For example, the configuration Activity can be declared like this:</p> <pre> diff --git a/docs/html/guide/topics/fundamentals.jd b/docs/html/guide/topics/fundamentals.jd index 640e44b..c10af8e 100644 --- a/docs/html/guide/topics/fundamentals.jd +++ b/docs/html/guide/topics/fundamentals.jd @@ -262,7 +262,7 @@ camera button has been pressed. </p> <p> -There are separate methods for activiating each type of component: +There are separate methods for activating each type of component: </p> <ul> diff --git a/docs/html/guide/topics/graphics/2d-graphics.jd b/docs/html/guide/topics/graphics/2d-graphics.jd index af584a2..051427b 100644 --- a/docs/html/guide/topics/graphics/2d-graphics.jd +++ b/docs/html/guide/topics/graphics/2d-graphics.jd @@ -43,7 +43,7 @@ including {@link android.graphics.drawable.BitmapDrawable}, {@link android.graph {@link android.graphics.drawable.PictureDrawable}, {@link android.graphics.drawable.LayerDrawable}, and several more. Of course, you can also extend these to define your own custom Drawable objects that behave in unique ways.</p> -<p>There are three ways to define and instantiate a Drawable: using an image saved in your project resouces; +<p>There are three ways to define and instantiate a Drawable: using an image saved in your project resources; using an XML file that defines the Drawable properties; or using the normal class constructors. Below, we'll discuss each the first two techniques (using constructors is nothing new for an experienced developer).</p> @@ -126,7 +126,7 @@ instead of directly transforming the Drawable, you should perform a <a href="#tw <a href="{@docRoot}guide/topics/ui/index.html">User Interface</a>. Hence, you understand the power and flexibility inherent in defining objects in XML. This philosophy caries over from Views to Drawables. If there is a Drawable object that you'd like to create, which is not initially dependent on variables defined by -your applicaton code or user interaction, then defining the Drawable in XML is a good option. +your application code or user interaction, then defining the Drawable in XML is a good option. Even if you expect your Drawable to change its properties during the user's experience with your application, you should consider defining the object in XML, as you can always modify properties once it is instantiated.</p> @@ -206,7 +206,7 @@ public class CustomDrawableView extends View { It's then given a color and the bounds of the shape are set. If you do not set the bounds, then the shape will not be drawn, whereas if you don't set the color, it will default to black.</p> <p>With the custom View defined, it can be drawn any way you like. With the sample above, we can -draw the shape progammatically in an Activity:</p> +draw the shape programmatically in an Activity:</p> <pre> CustomDrawableView mCustomDrawableView; @@ -248,7 +248,7 @@ of the object it's attached to. <h2 id="nine-patch">NinePatchDrawable</h2> <p>A {@link android.graphics.drawable.NinePatchDrawable} graphic is a stretchable bitmap image, which Android -will automatically resize to accomodate the contents of the View in which you have placed it as the background. +will automatically resize to accommodate the contents of the View in which you have placed it as the background. An example use of a NinePatch is the backgrounds used by standard Android buttons — buttons must stretch to accommodate strings of various lengths. A NinePatch drawable is a standard PNG image that includes an extra 1-pixel-wide border. It must be saved with the extension <code>.9.png</code>, @@ -271,7 +271,7 @@ and saved into the <code>res/drawable/</code> directory of your project. define this drawable area. </p> <p>To clarify the difference between the different lines, the left and top lines define -which pixels of the image are allowed to be replicated in order to strech the image. +which pixels of the image are allowed to be replicated in order to stretch the image. The bottom and right lines define the relative area within the image that the contents of the View are allowed to lie within.</p> <p> @@ -281,7 +281,7 @@ of the View are allowed to lie within.</p> <p>This NinePatch defines one stretchable area with the left and top lines and the drawable area with the bottom and right lines. In the top image, the dotted grey -lines identify the regions of the image that will be replicated in order to strech the image. The pink +lines identify the regions of the image that will be replicated in order to stretch the image. The pink rectangle in the bottom image identifies the region in which the contents of the View are allowed. If the contents don't fit in this region, then the image will be stretched so that they do. </p> @@ -333,7 +333,7 @@ the contents of a View object. So, if you have a TextView object, you can move, If it has a background image, the background image will be transformed along with the text. The {@link android.view.animation animation package} provides all the classes used in a tween animation.</p> -<p>A sequence of animation instructions defines the twen animation, defined by either XML or Android code. +<p>A sequence of animation instructions defines the tween animation, defined by either XML or Android code. Like defining a layout, an XML file is recommended because it's more readable, reusable, and swappable than hard-coding the animation. In the example below, we use XML. (To learn more about defining an animation in your application code, instead of XML, refer to the @@ -428,7 +428,7 @@ then assign the animation to the View with in the <a href="{@docRoot}guide/topics/resources/available-resources.html#animation">Available Resources</a>.</p> <p class="note"><strong>Note:</strong> Regardless of how your animation may move or resize, the bounds of the -View that holds your animation will not automatically adjust to accomodate it. Even so, the animation will still +View that holds your animation will not automatically adjust to accommodate it. Even so, the animation will still be drawn beyond the bounds of its View and will not be clipped. However, clipping <em>will occur</em> if the animation exceeds the bounds of the parent View.</p> diff --git a/docs/html/guide/topics/graphics/index.jd b/docs/html/guide/topics/graphics/index.jd index bc2a8bf..e1158be 100644 --- a/docs/html/guide/topics/graphics/index.jd +++ b/docs/html/guide/topics/graphics/index.jd @@ -112,7 +112,7 @@ like <code>drawBitmap(...)</code>, <code>drawRect(...)</code>, <code>drawText(.. Other classes that you might use also have <code>draw()</code> methods. For example, you'll probably have some {@link android.graphics.drawable.Drawable} objects that you want to put on the Canvas. Drawable has its own <code>{@link android.graphics.drawable.Drawable#draw(Canvas) draw()}</code> method -that takes your Canvas as an arguement.</p> +that takes your Canvas as an argument.</p> <h3 id="on-view">On a View</h3> @@ -124,7 +124,7 @@ and drawing with a Canvas in <code>{@link android.view.View#onDraw(Canvas) View. The most convenient aspect of doing so is that the Android framework will provide you with a pre-defined Canvas to which you will place your drawing calls.</p> -<p>To start, extend the {@link android.view.View} class (or descendent thereof) and define +<p>To start, extend the {@link android.view.View} class (or descendant thereof) and define the <code>{@link android.view.View#onDraw(Canvas) onDraw()}</code> callback method. This method will be called by the Android framework to request that your View draw itself. This is where you will perform all your calls to draw through the {@link android.graphics.Canvas}, which is passed to you through the <code>onDraw()</code> callback.</p> @@ -190,7 +190,7 @@ with <code>{@link android.graphics.Canvas#drawBitmap(Bitmap,Rect,RectF,Paint) dr you will see traces of the drawings you previously performed.</p> -<p>For a sample application, see the Lunar Landar game, in the SDK samples folder: +<p>For a sample application, see the Lunar Lander game, in the SDK samples folder: <code><your-sdk-directory>/samples/LunarLander/</code>. Or, browse the source in the <a href="{@docRoot}guide/samples/index.html">Sample Code</a> section.</p> diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index ac0030c..41c27c6 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -687,7 +687,7 @@ Values set here (other than "{@code stateUnspecified}" and keyboard. Rather, the contents of the window are automatically panned so that the current focus is never obscured by the keyboard and users can always see what they are typing. This is generally less - desireable than resizing, because the user may need to close the soft + desirable than resizing, because the user may need to close the soft keyboard to get at and interact with obscured parts of the window.</td> </tr> </table> diff --git a/docs/html/guide/topics/manifest/data-element.jd b/docs/html/guide/topics/manifest/data-element.jd index b48c5e0..b77fd05 100644 --- a/docs/html/guide/topics/manifest/data-element.jd +++ b/docs/html/guide/topics/manifest/data-element.jd @@ -28,7 +28,7 @@ attributes for each of its parts: These attributes are optional, but also mutually dependent: If a <code><a href="{@docRoot}guide/topics/manifest/data-element.html#scheme">scheme</a></code> is not specified for the intent filter, all the other URI attributes are ignored. If a -<code><a href="{@docRoot}guide/topics/manifest/data-element.html#host">host</a></code> is not specified for the filer, +<code><a href="{@docRoot}guide/topics/manifest/data-element.html#host">host</a></code> is not specified for the filter, the {@code port} attribute and all the path attributes are ignored. </p> diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd index c3e4a99..efbfa5a 100644 --- a/docs/html/guide/topics/manifest/manifest-intro.jd +++ b/docs/html/guide/topics/manifest/manifest-intro.jd @@ -112,7 +112,6 @@ other mention of the element name. <a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a> <a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission /></a> - <a href="{@docRoot}guide/topics/manifest/path-permission-element.html"><path-permission /></a> <a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data /></a> <a href="{@docRoot}guide/topics/manifest/provider-element.html"></provider></a> @@ -141,7 +140,6 @@ add your own elements or attributes. <br/><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html"><manifest></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/path-permission-element.html"><path-permission /></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/permission-element.html"><permission></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/permission-group-element.html"><permission-group></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/permission-tree-element.html"><permission-tree></a></code> diff --git a/docs/html/guide/topics/manifest/path-permission-element.jd b/docs/html/guide/topics/manifest/path-permission-element.jd deleted file mode 100644 index 5c271a7..0000000 --- a/docs/html/guide/topics/manifest/path-permission-element.jd +++ /dev/null @@ -1,104 +0,0 @@ -page.title=<path-permission> -@jd:body - -<dl class="xml"> -<dt>syntax:</dt> -<dd><pre class="stx"> -<path-permission android:<a href="#path">path</a>="<i>string</i>" - android:<a href="#pathPrefix">pathPrefix</a>="<i>string</i>" - android:<a href="#pathPattern">pathPattern</a>="<i>string</i>" - android:<a href="#permission">permission</a>="<i>string</i>" - android:<a href="#readPermission">readPermission</a>="<i>string</i>" - android:<a href="#writePermission">writePermission</a>="<i>string</i>" /> -</pre></dd> - -<dt>contained in:</dt> -<dd><code><a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a></code></dd> - -<!-- -<dt>can contain:</dt> -</dd> ---> - -<dt>description:</dt> -<dd>Defines the path and required permissions for a specific subset of data -within a content provider. This element can be -specified multiple times to supply multiple paths. - -</dd> - -<dt>attributes:</dt> - -<dd><dl class="attr"> -<dt><a name="path"></a>{@code android:path}</dt> -<dd>A complete URI path for a subset of content provider data. -Permission can be granted only to the particular data identified by this path. -When used to provide search suggestion content, it must be appended -with "/search_suggest_query". -</dd> - -<dt><a name="pathPrefix"></a>{@code android:pathPrefix}</dt> -<dd>The initial part of a URI path for a subset of content provider data. -Permission can be granted to all data subsets with paths that share this initial part. -</dd> - -<dt><a name="pathPattern"></a>{@code android:pathPattern}</dt> -<dd>A complete URI path for a subset of content provider data, -but one that can use the following wildcards: - -<ul> -<li>An asterisk ('<code class="Code prettyprint">*</code>'). This matches a sequence of 0 to many occurrences of -the immediately preceding character.</li> - -<li>A period followed by an asterisk ("<code class="Code prettyprint">.*</code>"). This matches any sequence of -0 or more characters.</li> -</ul> - -<p> -Because '<code class="Code prettyprint">\</code>' is used as an escape character when the string is read -from XML (before it is parsed as a pattern), you will need to double-escape. -For example, a literal '<code class="Code prettyprint">*</code>' would be written as "<code class="Code prettyprint">\\*</code>" and a -literal '<code class="Code prettyprint">\</code>' would be written as "<code class="Code prettyprint">\\</code>". This is basically -the same as what you would need to write if constructing the string in Java code. -</p> -<p> -For more information on these types of patterns, see the descriptions of -<a href="/reference/android/os/PatternMatcher.html#PATTERN_LITERAL">PATTERN_LITERAL</a>, -<a href="/reference/android/os/PatternMatcher.html#PATTERN_PREFIX">PATTERN_PREFIX</a>, and -<a href="/reference/android/os/PatternMatcher.html#PATTERN_SIMPLE_GLOB">PATTERN_SIMPLE_GLOB</a> in the -<a href="/reference/android/os/PatternMatcher.html">PatternMatcher</a> class. -</p> -</dd> - -<dt><a name="permission"></a>{@code android:permission}</dt> -<dd>The name of a permission that clients must have in order to read or write the -content provider's data. This attribute is a convenient way of setting a -single permission for both reading and writing. However, the -<code>readPermission</code> and -<code>writePermission</code> attributes take precedence -over this one. -</dd> - -<dt><a name="readPermission"></a>{@code android:readPermission}</dt> -<dd>A permission that clients must have in order to query the content provider. -</dd> - -<dt><a name="writePermission"></a>{@code android:writePermission}</dt> -<dd>A permission that clients must have in order to make changes to the data controlled by the content provider. -</dd> - - - -</dl></dd> - -<!-- ##api level indication## --> -<dt>introduced in:</dt> -<dd>API Level 4</dd> - -<dt>see also:</dt> -<dd>{@link android.app.SearchManager}</dd> -<dd>{@link android.Manifest.permission}</dd> -<dd><a href="/guide/topics/security/security.html">Security and -Permissions</a></dd> - -</dl> diff --git a/docs/html/guide/topics/manifest/permission-tree-element.jd b/docs/html/guide/topics/manifest/permission-tree-element.jd index 3074354..aecc930 100644 --- a/docs/html/guide/topics/manifest/permission-tree-element.jd +++ b/docs/html/guide/topics/manifest/permission-tree-element.jd @@ -46,7 +46,7 @@ strings in the user interface.</dd> <dd>The name that's at the base of the permission tree. It serves as a prefix to all permission names in the tree. Java-style scoping should be used to ensure that the name is unique. The name must have more than -two period-separated seqments in its path — for example, +two period-separated segments in its path — for example, {@code com.example.base} is OK, but {@code com.example} is not.</dd> </dl></dd> diff --git a/docs/html/guide/topics/manifest/provider-element.jd b/docs/html/guide/topics/manifest/provider-element.jd index 98892f1..c80b207 100644 --- a/docs/html/guide/topics/manifest/provider-element.jd +++ b/docs/html/guide/topics/manifest/provider-element.jd @@ -25,9 +25,7 @@ page.title=<provider> <dt>can contain:</dt> <dd><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code> -<br/><code><a href="{@docRoot}guide/topics/manifest/path-permission-element.html"><path-permission /></a></code> -</dd> +<br/><code><a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission></a></code></dd> <dt>description:</dt> <dd>Declares a content provider — a subclass of @@ -187,7 +185,7 @@ processes, and "{@code false}" if not. The default value is "{@code false}". Normally, a content provider is instantiated in the process of the application that defined it. However, if this flag is set to "{@code true}", the system can create an instance in every process where there's a client -that wants to interact withit, thus avoiding the overhead of interprocess +that wants to interact with it, thus avoiding the overhead of interprocess communication. </p></dd> diff --git a/docs/html/guide/topics/manifest/receiver-element.jd b/docs/html/guide/topics/manifest/receiver-element.jd index 280d402..b208917 100644 --- a/docs/html/guide/topics/manifest/receiver-element.jd +++ b/docs/html/guide/topics/manifest/receiver-element.jd @@ -17,7 +17,7 @@ page.title=<receiver> <dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code></dd> <dt>can contain:</dt> -<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filer></a></code> +<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code></dd> <dt>description:</dt> diff --git a/docs/html/guide/topics/manifest/service-element.jd b/docs/html/guide/topics/manifest/service-element.jd index e5ac7b5..0a44e2c 100644 --- a/docs/html/guide/topics/manifest/service-element.jd +++ b/docs/html/guide/topics/manifest/service-element.jd @@ -17,7 +17,7 @@ page.title=<service> <dd><code><a href="{@docRoot}guide/topics/manifest/application-element.html"><application></a></code></dd> <dt>can contain:</dt> -<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filer></a></code> +<dd><code><a href="{@docRoot}guide/topics/manifest/intent-filter-element.html"><intent-filter></a></code> <br/><code><a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data></a></code></dd> <dt>description:</dt> diff --git a/docs/html/guide/topics/media/jet/jetcreator_manual.jd b/docs/html/guide/topics/media/jet/jetcreator_manual.jd index 9692d97..214c79e 100644 --- a/docs/html/guide/topics/media/jet/jetcreator_manual.jd +++ b/docs/html/guide/topics/media/jet/jetcreator_manual.jd @@ -993,7 +993,7 @@ Both would be used together in an interactive game or application.</p> results, scoring or other game actions can take place. </li> <li><span lang=EN-IE>Musical transitions between levels or action sequences can be - synchronized to be musically seemless.</li> + synchronized to be musically seamless.</li> </ol> diff --git a/docs/html/guide/topics/providers/content-providers.jd b/docs/html/guide/topics/providers/content-providers.jd index 86dcebf..5da760a 100644 --- a/docs/html/guide/topics/providers/content-providers.jd +++ b/docs/html/guide/topics/providers/content-providers.jd @@ -731,7 +731,7 @@ class name of the content provider (made lowercase). So, for example, the URI for a TransportationProvider class could be defined as follows: <pre>public static final Uri CONTENT_URI = - Uri.parse("content://com.example.codelab.transporationprovider");</pre> + Uri.parse("content://com.example.codelab.transportationprovider");</pre> <p> If the provider has subtables, also define {@code CONTENT_URI} constants for @@ -740,9 +740,9 @@ that identifies the content provider), and be distinguished only by their paths. For example: </p> -<p style="margin-left: 2em">{@code content://com.example.codelab.transporationprovider/train} -<br/>{@code content://com.example.codelab.transporationprovider/air/domestic} -<br/>{@code content://com.example.codelab.transporationprovider/air/international}</p> +<p style="margin-left: 2em">{@code content://com.example.codelab.transportationprovider/train} +<br/>{@code content://com.example.codelab.transportationprovider/air/domestic} +<br/>{@code content://com.example.codelab.transportationprovider/air/international}</p> <p> For an overview of {@code content:} URIs, see the <a href="#urisum">Content URI diff --git a/docs/html/guide/topics/resources/available-resources.jd b/docs/html/guide/topics/resources/available-resources.jd index f5f1475..0e003a0 100644 --- a/docs/html/guide/topics/resources/available-resources.jd +++ b/docs/html/guide/topics/resources/available-resources.jd @@ -225,7 +225,7 @@ tags. <p> The following declares two strings: the first — simple text with no formatting (resulting in a CharSequence that is simply a String object) — the second includes formatting information in the string (resulting - in a CharSequence that is a complex data structure). If you are using the custom editor for string files in Eclipse, the HTML formatting tags will automatically be escaped and you will need to use {@link android.content.Context#getString(int) Context.getString()} and {@link android.text.Html#fromHtml} to retreive the resource and then convert it to formatted text. + in a CharSequence that is a complex data structure). If you are using the custom editor for string files in Eclipse, the HTML formatting tags will automatically be escaped and you will need to use {@link android.content.Context#getString(int) Context.getString()} and {@link android.text.Html#fromHtml} to retrieve the resource and then convert it to formatted text. </p> <pre> <resources> diff --git a/docs/html/guide/topics/resources/resources-i18n.jd b/docs/html/guide/topics/resources/resources-i18n.jd index 0c7baa1..fcf2af9 100755 --- a/docs/html/guide/topics/resources/resources-i18n.jd +++ b/docs/html/guide/topics/resources/resources-i18n.jd @@ -762,7 +762,7 @@ Android platform defines a "View" style class that contains all of the standard view attributes: padding, visibility, background, etc.; when View is inflated it uses this style class to retrieve those values from the XML file (at which point style and theme -information is applied as approriate) and load them into its instance.</p> +information is applied as appropriate) and load them into its instance.</p> <p><strong>Configuration</strong>: For any particular resource identifier, there may be multiple different available values depending on the current configuration. diff --git a/docs/html/guide/topics/ui/binding.jd b/docs/html/guide/topics/ui/binding.jd index 4745a3a..6ac0bb0 100644 --- a/docs/html/guide/topics/ui/binding.jd +++ b/docs/html/guide/topics/ui/binding.jd @@ -37,7 +37,7 @@ binds to data of some type. AdapterView is useful whenever you need to display s <h2 id="FillingTheLayout">Filling the Layout with Data</h2> <p>Inserting data into the layout is typically done by binding the AdapterView class to an {@link -android.widget.Adapter}, which retireves data from an external source (perhaps a list that +android.widget.Adapter}, which retrieves data from an external source (perhaps a list that the code supplies or query results from the device's database). </p> <p>The following code sample does the following:</p> <ol> @@ -68,7 +68,7 @@ SimpleCursorAdapter adapter2 = new SimpleCursorAdapter(this, android.R.layout.simple_spinner_item, // Use a template // that displays a // text view - cur, // Give the cursor to the list adatper + cur, // Give the cursor to the list adapter new String[] {People.NAME}, // Map the NAME column in the // people database to... new int[] {android.R.id.text1}); // The "text1" view defined in @@ -86,7 +86,7 @@ you should call {@link android.widget.ArrayAdapter#notifyDataSetChanged()}. This that the data has been changed and it should refresh itself.</p> <h2 id="HandlingUserSelections">Handling User Selections</h2> -<p>You handle the user's selecction by setting the class's {@link +<p>You handle the user's selection by setting the class's {@link android.widget.AdapterView.OnItemClickListener} member to a listener and catching the selection changes. </p> <pre> diff --git a/docs/html/guide/topics/ui/custom-components.jd b/docs/html/guide/topics/ui/custom-components.jd index b962f76..900e08b 100644 --- a/docs/html/guide/topics/ui/custom-components.jd +++ b/docs/html/guide/topics/ui/custom-components.jd @@ -159,7 +159,7 @@ custom components, styled text, or anything else you can think of.</p> <p class="note"><strong>Note:</strong> This does not apply to 3D graphics. If you want to use 3D graphics, you must extend {@link android.view.SurfaceView SurfaceView} -instead of View, and draw from a seperate thread. See the +instead of View, and draw from a separate thread. See the GLSurfaceViewActivity sample for details.</p> @@ -443,7 +443,7 @@ useful in certain circumstances. If there is a component that is already very similar to what you want, you can simply extend that component and just override the behavior that you want to change. You can do all of the things you would do with a fully customized component, but by starting with a more -specialized class in the View heirarchy, you can also get a lot of behavior for +specialized class in the View hierarchy, you can also get a lot of behavior for free that probably does exactly what you want.</p> <p>For example, the SDK includes a <a href="{@docRoot}resources/samples/NotePad/index.html">NotePad application</a> in the diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd index f965966..662efbf 100644 --- a/docs/html/guide/topics/ui/declaring-layout.jd +++ b/docs/html/guide/topics/ui/declaring-layout.jd @@ -119,7 +119,7 @@ public void onCreate(Bundle savedInstanceState) { <p>The <code>onCreate()</code> callback method in your Activity is called by the Android framework when your Activity is launched (see the discussion on Lifecycles, in the -<a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Application Fundamantals</a>, for more on this).</p> +<a href="{@docRoot}guide/topics/fundamentals.html#lcycles">Application Fundamentals</a>, for more on this).</p> <h2 id="attributes">Attributes</h2> diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd index fa2d916..74b544b 100644 --- a/docs/html/guide/topics/ui/dialogs.jd +++ b/docs/html/guide/topics/ui/dialogs.jd @@ -154,7 +154,7 @@ to the object and if the dialog is showing, it will dismiss it.</p> <h3>Using dismiss listeners</h3> -<p>If you'd like your applcation to perform some procedures the moment that a dialog is dismissed, +<p>If you'd like your application to perform some procedures the moment that a dialog is dismissed, then you should attach an on-dismiss listener to your Dialog.</p> <p>First define the {@link android.content.DialogInterface.OnDismissListener} interface. diff --git a/docs/html/guide/topics/ui/how-android-draws.jd b/docs/html/guide/topics/ui/how-android-draws.jd index 21f9833..efb55a2 100644 --- a/docs/html/guide/topics/ui/how-android-draws.jd +++ b/docs/html/guide/topics/ui/how-android-draws.jd @@ -51,7 +51,7 @@ and each View is responsible for drawing itself. </p> <div class="sidebox"><p> - To intiate a layout, call <code>{@link android.view.View#requestLayout}</code>. This method is typically + To initiate a layout, call <code>{@link android.view.View#requestLayout}</code>. This method is typically called by a View on itself when it believes that is can no longer fit within its current bounds.</p> </div> @@ -86,7 +86,7 @@ and each View is responsible for drawing itself. child. The child must use this size, and guarantee that all of its descendants will fit within this size.</li> <li><var>AT_MOST</var>: This is used by the parent to impose a maximum size on the - child. The child must gurantee that it and all of its descendants will fit + child. The child must guarantee that it and all of its descendants will fit within this size.</li> </ul> diff --git a/docs/html/guide/topics/ui/index.jd b/docs/html/guide/topics/ui/index.jd index ef23672..494bda8 100644 --- a/docs/html/guide/topics/ui/index.jd +++ b/docs/html/guide/topics/ui/index.jd @@ -74,7 +74,7 @@ and drawn, read <a href="how-android-draws.html">How Android Draws Views</a>.</p <p>The most common way to define your layout and express the view hierarchy is with an XML layout file. XML offers a human-readable structure for the layout, much like HTML. Each element in XML is -either a View or ViewGroup object (or descendent thereof). View objects are leaves in the tree, +either a View or ViewGroup object (or descendant thereof). View objects are leaves in the tree, ViewGroup objects are branches in the tree (see the View Hierarchy figure above).</p> <p>The name of an XML element is respective to the Java class that it represents. So a <code><TextView></code> element creates diff --git a/docs/html/guide/topics/ui/menus.jd b/docs/html/guide/topics/ui/menus.jd index bad8d65..cf3c7de 100644 --- a/docs/html/guide/topics/ui/menus.jd +++ b/docs/html/guide/topics/ui/menus.jd @@ -86,7 +86,7 @@ an icon, a keyboard shortcut, an intent, and other settings for the item.</p> Usually, you'll want to use one that accepts an <var>itemId</var> argument. This is a unique integer that allows you to identify the item during a callback.</p> -<p>When a menu item is selected from the Options Menu, you will recieve a callback to the +<p>When a menu item is selected from the Options Menu, you will receive a callback to the <code>{@link android.app.Activity#onOptionsItemSelected(MenuItem) onOptionsItemSelected()}</code> method of your Activity. This callback passes you the <code>MenuItem</code> that has been selected. You can identify the item by requesting the @@ -216,7 +216,7 @@ from the {@code MenuItem}, which provides information about the currently select All we need from this is the list ID for the selected item, so whether editing a note or deleting it, we find the ID with the {@code AdapterContextMenuInfo.info} field of the object. This ID -is passed to the <code>editNote()</code> and <code>deleteNote()</code> methods to perfrom +is passed to the <code>editNote()</code> and <code>deleteNote()</code> methods to perform the respective action.</p> <p>Now, to register this context menu for all the items in a {@link android.widget.ListView}, @@ -338,7 +338,7 @@ and set whether the items can be checkable with <img align="right" src="{@docRoot}images/radio_buttons.png" alt="" /> <p>Any menu item can be used as an interface for turning options on and off. This can be indicated with a checkbox for stand-alone options, or radio buttons for groups of -mutually exlusive options (see the screenshot, to the right).</p> +mutually exclusive options (see the screenshot, to the right).</p> <p class="note"><strong>Note:</strong> Menu items in the Icon Menu cannot display a checkbox or radio button. If you choose to make items in the Icon Menu checkable, @@ -490,7 +490,7 @@ public boolean onCreateOptionsMenu(Menu menu){ null, // Specific items to place first (none) intent, // Intent created above that describes our requirements 0, // Additional flags to control items (none) - null); // Array of MenuItems that corrolate to specific items (none) + null); // Array of MenuItems that correlate to specific items (none) return true; }</pre> diff --git a/docs/html/guide/topics/ui/notifiers/index.jd b/docs/html/guide/topics/ui/notifiers/index.jd index 5b37f5b6..f7ccce7 100644 --- a/docs/html/guide/topics/ui/notifiers/index.jd +++ b/docs/html/guide/topics/ui/notifiers/index.jd @@ -25,7 +25,7 @@ and others do not. For example:</p> <li>When an event such as saving a file is complete, a small message should appear to confirm that the save was successful.</li> <li>If the application is running in the background and needs the user's attention, -the application should create a notificaiton that allows the user to respond at +the application should create a notification that allows the user to respond at his or her convenience.</li> <li>If the application is performing work that the user must wait for (such as loading a file), @@ -49,7 +49,7 @@ links to full documentation.</p> <img src="{@docRoot}images/toast.png" alt="" style="float:right" /> -<p>A toast notificaiton is a message that pops up on the surface of the window. +<p>A toast notification is a message that pops up on the surface of the window. It only fills the amount of space required for the message and the user's current activity remains visible and interactive. The notification automatically fades in and out, and does not accept interaction events. Because a toast can be created from a background @@ -97,7 +97,7 @@ for notifications and short activities that directly relate to the application i <p>You should use a dialog when you need to show a progress bar or a short message that requires confirmation from the user (such as an alert with "OK" and "Cancel" buttons). -You can use also use dialogs as integral componenents +You can use also use dialogs as integral components in your application's UI and for other purposes besides notifications. For a complete discussion on all the available types of dialogs, including its uses for notifications, refer to diff --git a/docs/html/guide/topics/ui/notifiers/notifications.jd b/docs/html/guide/topics/ui/notifiers/notifications.jd index e6fa48f..a0dd9f1 100644 --- a/docs/html/guide/topics/ui/notifiers/notifications.jd +++ b/docs/html/guide/topics/ui/notifiers/notifications.jd @@ -316,7 +316,7 @@ using Notification fields and flags. Some useful features include the following: your notification is on-going.</dd> <dt><var>number</var> field</dt> <dd>This value indicates the current number of events represented by the notification. - The appropriate number is overlayed on top of the status bar icon. + The appropriate number is overlaid on top of the status bar icon. If you intend to use this field, then you must start with "1" when the Notification is first created. (If you change the value from zero to anything greater during an update, the number is not shown.)</dd> @@ -375,7 +375,7 @@ pass it to the <var>contentView</var> field of your Notification. Pass the </pre> <p>This layout is used for the expanded view, - but the content of the ImageView and TextView still needs to be defined by the applicaiton. + but the content of the ImageView and TextView still needs to be defined by the application. RemoteViews offers some convenient methods that allow you to define this content...</p> </li> @@ -389,7 +389,7 @@ contentView.setTextViewText(R.id.text, "Hello, this message is in a custom expan notification.contentView = contentView; </pre> - <p>As shown here, pass the applicaiton's package name and the layout + <p>As shown here, pass the application's package name and the layout resource ID to the RemoteViews constructor. Then, define the content for the ImageView and TextView, using the {@link android.widget.RemoteViews#setImageViewResource(int, int) setImageViewResource()} and {@link android.widget.RemoteViews#setTextViewText(int, CharSequence) setTextViewText()}. diff --git a/docs/html/guide/topics/ui/notifiers/toasts.jd b/docs/html/guide/topics/ui/notifiers/toasts.jd index a800c3c..5b324d2 100644 --- a/docs/html/guide/topics/ui/notifiers/toasts.jd +++ b/docs/html/guide/topics/ui/notifiers/toasts.jd @@ -18,7 +18,7 @@ parent.link=index.html </div> </div> -<p>A toast notificaiton is a message that pops up on the surface of the window. +<p>A toast notification is a message that pops up on the surface of the window. It only fills the amount of space required for the message and the user's current activity remains visible and interactive. The notification automatically fades in and out, and does not accept interaction events.</p> diff --git a/docs/html/guide/topics/ui/themes.jd b/docs/html/guide/topics/ui/themes.jd index 41e8563..0399512 100644 --- a/docs/html/guide/topics/ui/themes.jd +++ b/docs/html/guide/topics/ui/themes.jd @@ -111,7 +111,7 @@ This technique can be used only in XML resources. </p> <h3 id="inTheManifest">Set the theme in the manifest</h3> -<p>To set this theme for all the activites of your application, open the AndroidManifest.xml file and +<p>To set this theme for all the activities of your application, open the AndroidManifest.xml file and edit the <code><application></code> tag to include the <code>android:theme</code> attribute with the theme name:</p> diff --git a/docs/html/guide/topics/ui/ui-events.jd b/docs/html/guide/topics/ui/ui-events.jd index a4dd614..ccef64f 100644 --- a/docs/html/guide/topics/ui/ui-events.jd +++ b/docs/html/guide/topics/ui/ui-events.jd @@ -139,7 +139,7 @@ depends on the event. For the few that do, here's why:</p> this event can have multiple actions that follow each other. So, if you return <em>false</em> when the down action event is received, you indicate that you have not consumed the event and are also not interested in subsequent actions from this event. Thus, you will not be called for any other actions - within the event, such as a fingure gesture, or the eventual up action event.</li> + within the event, such as a finger gesture, or the eventual up action event.</li> </ul> <p>Remember that key events are always delivered to the View currently in focus. They are dispatched starting from the top diff --git a/docs/html/guide/topics/views/custom-views.jd b/docs/html/guide/topics/views/custom-views.jd index c255293..8589b1a 100644 --- a/docs/html/guide/topics/views/custom-views.jd +++ b/docs/html/guide/topics/views/custom-views.jd @@ -151,7 +151,7 @@ custom components, styled text, or anything else you can think of.</p> <p><em>Note:</em> Except for 3D graphics. If you want to use 3D graphics, you must extend {@link android.view.SurfaceView SurfaceView} -instead of View, and draw from a seperate thread. See the +instead of View, and draw from a separate thread. See the GLSurfaceViewActivity sample for details.</p> <p><code>onMeasure()</code> is a little more involved. <code>onMeasure()</code> @@ -171,7 +171,7 @@ result will be an exception at measurement time.</p> <li> The overridden <code>onMeasure()</code> method is called with width and height measure specifications (<code>widthMeasureSpec</code> and - <code>heighMeasureSpec</code> parameters, both are integer codes + <code>heightMeasureSpec</code> parameters, both are integer codes representing dimensions) which should be treated as requirements for the restrictions on the width and height measurements you should produce. A full reference to the kind of restrictions these specifications can require @@ -434,7 +434,7 @@ useful in certain circumstances. If there is a component that is already very similar to what you want, you can simply extend that component and just override the behavior that you want to change. You can do all of the things you would do with a fully customized component, but by starting with a more -specialized class in the View heirarchy, you can also get a lot of behavior for +specialized class in the View hierarchy, you can also get a lot of behavior for free that probably does exactly what you want.</p> <p>For example, the SDK includes a <a href="{@docRoot}samples/NotePad/index.html">NotePad application</a> in the diff --git a/docs/html/guide/tutorials/hello-world.jd b/docs/html/guide/tutorials/hello-world.jd index 58d1a16..f6b54ff 100644 --- a/docs/html/guide/tutorials/hello-world.jd +++ b/docs/html/guide/tutorials/hello-world.jd @@ -478,12 +478,12 @@ particularly powerful with the code-completion features of IDEs like Eclipse because it lets you quickly and interactively locate the specific reference you're looking for.</p> -<p>It's possible yours looks slighly different than this (perhaps the hexadecimal values are different). +<p>It's possible yours looks slightly different than this (perhaps the hexadecimal values are different). For now, notice the inner class named "layout", and its member field "main". The Eclipse plugin noticed the XML layout file named main.xml and generated a class for it here. As you add other resources to your project (such as strings in the <code>res/values/string.xml</code> file or drawables inside -the <code>res/drawable/</code> direcory) you'll see <code>R.java</code> change to keep up.</p> +the <code>res/drawable/</code> directory) you'll see <code>R.java</code> change to keep up.</p> <p>When not using Eclipse, this class file will be generated for you at build time (with the Ant tool).</p> <p><em>You should never edit this file by hand.</em></p> </div> diff --git a/docs/html/guide/tutorials/views/hello-autocomplete.jd b/docs/html/guide/tutorials/views/hello-autocomplete.jd index fba1ad8..07235a1 100644 --- a/docs/html/guide/tutorials/views/hello-autocomplete.jd +++ b/docs/html/guide/tutorials/views/hello-autocomplete.jd @@ -44,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) { textView.setAdapter(adapter); } </pre> - <p>Here, we create an AutoComplteteTextView from our layout. We then + <p>Here, we create an AutoCompleteTextView from our layout. We then create an {@link android.widget.ArrayAdapter} that binds a <code>simple_dropdown_item_1line</code> layout item to each entry in the <code>COUNTRIES</code> array (which we'll add next). The last part sets the ArrayAdapter to associate with our AutoCompleteTextView.</p> diff --git a/docs/html/guide/tutorials/views/hello-formstuff.jd b/docs/html/guide/tutorials/views/hello-formstuff.jd index da4289c..b554001 100644 --- a/docs/html/guide/tutorials/views/hello-formstuff.jd +++ b/docs/html/guide/tutorials/views/hello-formstuff.jd @@ -175,7 +175,7 @@ inside a {@link android.widget.RadioGroup}: </li> <li>To do something when each is selected, we'll need an OnClickListener. Unlike the other listeners we've created, instead of creating this one as an anonymous inner class, -we'll create it as a new object. This way, we can re-use the OnClickLIstener for +we'll create it as a new object. This way, we can re-use the OnClickListener for both RadioButtons. So, add the following code in the HelloFormStuff Activity (<em>outside</em> the <code>onCreate()</code> method): <pre> diff --git a/docs/html/guide/tutorials/views/hello-gridview.jd b/docs/html/guide/tutorials/views/hello-gridview.jd index ffb6c93..186c4e7 100644 --- a/docs/html/guide/tutorials/views/hello-gridview.jd +++ b/docs/html/guide/tutorials/views/hello-gridview.jd @@ -94,7 +94,7 @@ public class ImageAdapter extends BaseAdapter { } </pre> <p>First we take care of some required methods inherited from BaseAdapter. - The constructor and <code>getCount()</code> are self-explanitory. Normally, <code>getItem()</code> + The constructor and <code>getCount()</code> are self-explanatory. Normally, <code>getItem()</code> should return the actual object at the specified position in our Adapter, but for this Hello World, we're not going to bother. Likewise, <code>getItemId()</code> should return the row id of the item, but right now we don't care.</p> diff --git a/docs/html/guide/tutorials/views/hello-mapview.jd b/docs/html/guide/tutorials/views/hello-mapview.jd index 7a21485..458db4f 100644 --- a/docs/html/guide/tutorials/views/hello-mapview.jd +++ b/docs/html/guide/tutorials/views/hello-mapview.jd @@ -81,7 +81,7 @@ First, we'll create a simple Activity that can view and navigate a map. Then we <li>Now open the HelloMapView.java file. For this Activity, we're going to extend the special sub-class of Activity called MapActivity, so change the class declaration to extend - MapActicity, instead of Activity:</p> + MapActivity, instead of Activity:</p> <pre>public class HelloMapView extends MapActivity {</pre> diff --git a/docs/html/guide/tutorials/views/hello-tabwidget.jd b/docs/html/guide/tutorials/views/hello-tabwidget.jd index 8424616..98dddf5 100644 --- a/docs/html/guide/tutorials/views/hello-tabwidget.jd +++ b/docs/html/guide/tutorials/views/hello-tabwidget.jd @@ -53,7 +53,7 @@ tabs to navigate between different views.</p> be associated with a different tab. In this case, each tab simply shows a different {@link android.widget.TextView} with some text. </p> <p>Notice that the TabWidget and the FrameLayout elements have specific <code>android</code> namespace IDs. These are necessary - so that the TabHost can automatically retireve references to them, populate the TabWidget with the tabs that we'll define + so that the TabHost can automatically retrieve references to them, populate the TabWidget with the tabs that we'll define in our code, and swap the views in the FrameLayout. We've also defined our own IDs for each TextView, which we'll use to associate each tab with the view that it should reveal.</p> <p>Of course, you can diff --git a/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip b/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip Binary files differindex 24fefc1..502a326 100644 --- a/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip +++ b/docs/html/resources/tutorials/notepad/codelab/NotepadCodeLab.zip diff --git a/docs/html/resources/tutorials/notepad/notepad-ex2.jd b/docs/html/resources/tutorials/notepad/notepad-ex2.jd index bab9471..44a04ab 100644 --- a/docs/html/resources/tutorials/notepad/notepad-ex2.jd +++ b/docs/html/resources/tutorials/notepad/notepad-ex2.jd @@ -5,7 +5,7 @@ parent.link=index.html <p><em>In this exercise, you will add a second Activity to your notepad application, to let the user -create and edit notes. You will also allow the user to delete existing notes through a context menu. +create and edit notes. You will also allow the user to delete existing notes through a context menu. The new Activity assumes responsibility for creating new notes by collecting user input and packing it into a return Bundle provided by the intent. This exercise demonstrates:</em></p> @@ -55,7 +55,7 @@ Tools</strong> > <strong>Fix Project Properties</strong>.</p> </li> <li> There are also a couple of new overridden methods - (<code>onCreateContextMenu()</code>, <code>onContextItemSelected()</code>, + (<code>onCreateContextMenu()</code>, <code>onContextItemSelected()</code>, <code>onListItemClick()</code> and <code>onActivityResult()</code>) which we will be filling in below. </li> @@ -75,7 +75,7 @@ Open the Notepadv2 class.</p> <ol> <li>In order for each list item in the ListView to register for the context menu, we call - <code>registerForContextMenu()</code> and pass it our ListView. So, at the very end of + <code>registerForContextMenu()</code> and pass it our ListView. So, at the very end of the <code>onCreate()</code> method add this line: <pre>registerForContextMenu(getListView());</pre> <p>Because our Activity extends the ListActivity class, <code>getListView()</code> will return us @@ -91,7 +91,7 @@ public boolean onCreateContextMenu(Menu menu, View v super.onCreateContextMenu(menu, v, menuInfo); menu.add(0, DELETE_ID, 0, R.string.menu_delete); }</pre> - <p>The <code>onCreateContextMenu()</code> callback some passes other information in addition to the Menu object, + <p>The <code>onCreateContextMenu()</code> callback passes some other information in addition to the Menu object, such as the View that has been triggered for the menu and an extra object that may contain additional information about the object selected. However, we don't care about these here, because we only have one kind of object in the Activity that uses context menus. In the next @@ -102,7 +102,7 @@ public boolean onCreateContextMenu(Menu menu, View v <h2>Step 3</h2> <p>Now that the we've registered our ListView for a context menu and defined our context menu item, we need to handle the callback when it is selected. For this, we need to identify the list ID of the - selected item, then delete it. So fill in the + selected item, then delete it. So fill in the <code>onContextItemSelected()</code> method like this:</p> <pre> public boolean onContextItemSelected(MenuItem item) { @@ -127,15 +127,15 @@ can now be deleted.</p> margin-bottom:.5em;margin-top:1em;padding:0em;width:240px;"> <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0; background-color:#FFFFDD;">Starting Other Activities</h2> - <p style="padding-left:.5em;font-size:12px;margin:0; + <p style="padding-left:.5em;font-size:12px;margin:0; padding:.0em .5em .5em 1em;">In this example our Intent uses a class name specifically. - As well as - <a href="{@docRoot}resources/faq/commontasks.html#intentexamples">starting intents</a> in - classes we already know about, be they in our own application or another - application, we can also create Intents without knowing exactly which + As well as + <a href="{@docRoot}resources/faq/commontasks.html#intentexamples">starting intents</a> in + classes we already know about, be they in our own application or another + application, we can also create Intents without knowing exactly which application will handle it.</p> - <p style="padding-left:.5em;font-size:12px;margin:0; - padding:.0em .5em .5em 1em;">For example, we might want to open a page in a + <p style="padding-left:.5em;font-size:12px;margin:0; + padding:.0em .5em .5em 1em;">For example, we might want to open a page in a browser, and for this we still use an Intent. But instead of specifying a class to handle it, we use a predefined Intent constant, and a content URI that describes what we @@ -155,7 +155,7 @@ startActivityForResult(i, ACTIVITY_CREATE);</pre> <code>NoteEdit</code>. Since the Intent class will need to communicate with the Android operating system to route requests, we also have to provide a Context (<code>this</code>).</p> <p>The <code>startActivityForResult()</code> method fires the Intent in a way that causes a method - in our Activity to be called when the new Activity is completed. The method in our Activity + in our Activity to be called when the new Activity is completed. The method in our Activity that receives the callback is called <code>onActivityResult()</code> and we will implement it in a later step. The other way to call an Activity is using <code>startActivity()</code> but this is a "fire-and-forget" way @@ -164,7 +164,7 @@ startActivityForResult(i, ACTIVITY_CREATE);</pre> <p>Don't worry about the fact that <code>NoteEdit</code> doesn't exist yet, we will fix that soon. </p> </li> - + <h2>Step 5</h2> @@ -180,7 +180,7 @@ startActivityForResult(i, ACTIVITY_CREATE);</pre> interested in is the <code>position</code> that the user selected. We use this to get the data from the correct row, and bundle it up to send to the <code>NoteEdit</code> Activity.</p> - <p>In our implementation of the callback, the method creates an + <p>In our implementation of the callback, the method creates an <code>Intent</code> to edit the note using the <code>NoteEdit</code> class. It then adds data into the extras Bundle of the Intent, which will be passed to the called Activity. We use it @@ -207,7 +207,7 @@ startActivityForResult(i, ACTIVITY_EDIT);</pre> </li> <li> The details of the note are pulled out from our query Cursor, which we move to the - proper position for the element that was selected in the list, with + proper position for the element that was selected in the list, with the <code>moveToPosition()</code> method.</li> <li>With the extras added to the Intent, we invoke the Intent on the <code>NoteEdit</code> class by passing <code>startActivityForResult()</code> @@ -219,7 +219,7 @@ startActivityForResult(i, ACTIVITY_EDIT);</pre> variable is much more efficient than accessing a field in the Dalvik VM, so by doing this we make only one access to the field, and five accesses to the local variable, making the routine much more efficient. It is recommended that you use this optimization when possible.</p> - + <h2>Step 6</h2> @@ -243,7 +243,7 @@ startActivityForResult(i, ACTIVITY_EDIT);</pre> <li><code>intent</code> — this is an Intent created by the Activity returning results. It can be used to return data in the Intent "extras." </li> - </ul> + </ul> <p>The combination of <code>startActivityForResult()</code> and <code>onActivityResult()</code> can be thought of as an asynchronous RPC (remote procedure call) and forms the recommended way for an Activity to invoke @@ -277,7 +277,7 @@ case ACTIVITY_EDIT: <code>ACTIVITY_EDIT</code> activity results in this method. </li> <li> - In the case of a create, we pull the title and body from the extras (retrieved from the + In the case of a create, we pull the title and body from the extras (retrieved from the returned Intent) and use them to create a new note. </li> <li> @@ -288,7 +288,7 @@ case ACTIVITY_EDIT: <code>fillData()</code> at the end ensures everything is up to date . </li> </ul> - + <h2>Step 7</h2> @@ -305,8 +305,8 @@ case ACTIVITY_EDIT: good UI is part art and part science, and the rest is work. Mastery of <a href="{@docRoot}guide/topics/ui/declaring-layout.html">Declaring Layout</a> is an essential part of creating a good looking Android application.</p> - <p style="padding-left:.5em;font-size:12px;margin:0; - padding:.0em .5em .5em 1em;">Take a look at the + <p style="padding-left:.5em;font-size:12px;margin:0; + padding:.0em .5em .5em 1em;">Take a look at the <a href="{@docRoot}resources/tutorials/views/index.html">Hello Views</a> for some example layouts and how to use them. The ApiDemos sample project is also a great resource from which to learn how to create different layouts.</p> @@ -335,7 +335,7 @@ case ACTIVITY_EDIT: <code>layout_weight</code> specified, so it takes up the minimum space required to render. If the <code>layout_weight</code> of each of the two text edit elements is set to 1, the remaining width in the parent layout will - be split equally between them (because we claim they are equally important). + be split equally between them (because we claim they are equally important). If the first one has a <code>layout_weight</code> of 1 and the second has a <code>layout_weight</code> of 2, then one third of the remaining space will be given to the first, and two thirds to the @@ -373,7 +373,7 @@ case ACTIVITY_EDIT: <code>onCreate(Bundle)</code> — and check the box next to it.</li> <li>Click <strong>OK</strong>.<p>The method should now appear in your class.</p></li> </ol> - + <h2>Step 9</h2> <p>Fill in the body of the <code>onCreate()</code> method for <code>NoteEdit</code>.</p> @@ -388,7 +388,7 @@ case ACTIVITY_EDIT: <p>We can then unbundle the values that were passed in to the Activity with the extras Bundle attached to the calling Intent. We'll use them to pre-populate the title and body text edit views so that the user can edit them. - Then we will grab and store the <code>mRowId</code> so we can keep + Then we will grab and store the <code>mRowId</code> so we can keep track of what note the user is editing.</p> <ol> @@ -406,14 +406,14 @@ case ACTIVITY_EDIT: mTitleText = (EditText) findViewById(R.id.title); mBodyText = (EditText) findViewById(R.id.body); Button confirmButton = (Button) findViewById(R.id.confirm);</pre> - <p>Note that <code>mTitleText</code> and <code>mBodyText</code> are member + <p>Note that <code>mTitleText</code> and <code>mBodyText</code> are member fields (you need to declare them at the top of the class definition).</p> </li> <li>At the top of the class, declare a <code>Long mRowId</code> private field to store the current <code>mRowId</code> being edited (if any). </li> - <li>Continuing inside <code>onCreate()</code>, - add code to initialize the <code>title</code>, <code>body</code> and + <li>Continuing inside <code>onCreate()</code>, + add code to initialize the <code>title</code>, <code>body</code> and <code>mRowId</code> from the extras Bundle in the Intent (if it is present):<br> <pre> @@ -423,7 +423,7 @@ if (extras != null) { String title = extras.getString(NotesDbAdapter.KEY_TITLE); String body = extras.getString(NotesDbAdapter.KEY_BODY); mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID); - + if (title != null) { mTitleText.setText(title); } @@ -459,16 +459,16 @@ if (extras != null) { confirmButton.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - + } - + });</pre> </li> </ol> <h2>Step 10</h2> <p>Fill in the body of the <code>onClick()</code> method of the <code>OnClickListener</code> created in the last step.</p> - + <p>This is the code that will be run when the user clicks on the confirm button. We want this to grab the title and body text from the edit text fields, and put them into the return Bundle so that they can be passed @@ -483,7 +483,7 @@ confirmButton.setOnClickListener(new View.OnClickListener() { constants defined in Notepadv2 as keys:<br> <pre> Bundle bundle = new Bundle(); - + bundle.putString(NotesDbAdapter.KEY_TITLE, mTitleText.getText().toString()); bundle.putString(NotesDbAdapter.KEY_BODY, mBodyText.getText().toString()); if (mRowId != null) { @@ -498,7 +498,7 @@ mIntent.putExtras(bundle); setResult(RESULT_OK, mIntent); finish();</pre> <ul> - <li>The Intent is simply our data carrier that carries our Bundle + <li>The Intent is simply our data carrier that carries our Bundle (with the title, body and mRowId).</li> <li>The <code>setResult()</code> method is used to set the result code and return Intent to be passed back to the @@ -521,19 +521,19 @@ private Long mRowId; protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.note_edit); - + mTitleText = (EditText) findViewById(R.id.title); mBodyText = (EditText) findViewById(R.id.body); - + Button confirmButton = (Button) findViewById(R.id.confirm); - + mRowId = null; Bundle extras = getIntent().getExtras(); if (extras != null) { String title = extras.getString(NotesDbAdapter.KEY_TITLE); String body = extras.getString(NotesDbAdapter.KEY_BODY); mRowId = extras.getLong(NotesDbAdapter.KEY_ROWID); - + if (title != null) { mTitleText.setText(title); } @@ -541,12 +541,12 @@ protected void onCreate(Bundle savedInstanceState) { mBodyText.setText(body); } } - + confirmButton.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { Bundle bundle = new Bundle(); - + bundle.putString(NotesDbAdapter.KEY_TITLE, mTitleText.getText().toString()); bundle.putString(NotesDbAdapter.KEY_BODY, mBodyText.getText().toString()); if (mRowId != null) { @@ -562,7 +562,7 @@ protected void onCreate(Bundle savedInstanceState) { }</pre> </li> </ol> - + <h2>Step 11</h2> <div class="sidebox" style="border:2px solid #FFFFDD;float:right; @@ -570,16 +570,16 @@ protected void onCreate(Bundle savedInstanceState) { margin-bottom:.5em;margin-top:1em;padding:0em;width:240px;"> <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0; background-color:#FFFFDD;">The All-Important Android Manifest File</h2> - <p style="padding-left:.5em;font-size:12px;margin:0; - padding:.0em .5em .5em 1em;">The AndroidManifest.xml file is the way in which Android sees your + <p style="padding-left:.5em;font-size:12px;margin:0; + padding:.0em .5em .5em 1em;">The AndroidManifest.xml file is the way in which Android sees your application. This file defines the category of the application, where it shows up (or even if it shows up) in the launcher or settings, what activities, services, and content providers it defines, what intents it can receive, and more. </p> - <p style="padding-left:.5em;font-size:12px;margin:0; - padding:.0em .5em .5em 1em;">For more information, see the reference document + <p style="padding-left:.5em;font-size:12px;margin:0; + padding:.0em .5em .5em 1em;">For more information, see the reference document <a href="{@docRoot}guide/topics/manifest/manifest-intro.html">The AndroidManifest.xml File</a></p> - </div> + </div> <p>Finally, the new Activity has to be defined in the manifest file:</p> <p>Before the new Activity can be seen by Android, it needs its own @@ -597,10 +597,10 @@ protected void onCreate(Bundle savedInstanceState) { </li> <li>Click the <strong>Application</strong> tab at the bottom of the Manifest editor.</li> <li>Click <strong>Add...</strong> in the Application Nodes section. - <p>If you see a dialog with radiobuttons at the top, select the top radio button: + <p>If you see a dialog with radiobuttons at the top, select the top radio button: "Create a new element at the top level, in Application".</p></li> <li>Make sure "(A) Activity" is selected in the selection pane of the dialog, and click <strong>OK</strong>.</li> - <li>Click on the new "Activity" node, in the Application Nodes section, then + <li>Click on the new "Activity" node, in the Application Nodes section, then type <code>.NoteEdit</code> into the <em>Name*</em> field to the right. Press Return/Enter.</li> </ol> @@ -608,28 +608,28 @@ protected void onCreate(Bundle savedInstanceState) { file, have a look around at some of the other options available (but be careful not to select them otherwise they will be added to your Manifest). This editor should help you understand and alter the AndroidManifest.xml file as you move on to more advanced Android applications.</p> - + <p class="note">If you prefer to edit this file directly, simply open the <code>AndroidManifest.xml</code> file and look at the source (use the <code>AndroidManifest.xml</code> tab in the eclipse editor to see the source code directly). Then edit the file as follows:<br> - <code><activity android:name=".NoteEdit"></activity></code><br><br> + <code><activity android:name=".NoteEdit" /></code><br><br> This should be placed just below the line that reads:<br> <code></activity></code> for the <code>.Notepadv2</code> activity.</p> <h2 style="clear:right;">Step 12</h2> <p>Now Run it!</p> -<p>You should now be able to add real notes from -the menu, as well as delete an existing one. Notice that in order to delete, you must +<p>You should now be able to add real notes from +the menu, as well as delete an existing one. Notice that in order to delete, you must first use the directional controls on the device to highlight the note. -Furthermore, selecting a note title from the list should bring up the note -editor to let you edit it. Press confirm when finished to save the changes +Furthermore, selecting a note title from the list should bring up the note +editor to let you edit it. Press confirm when finished to save the changes back to the database. <h2>Solution and Next Steps</h2> -<p>You can see the solution to this exercise in <code>Notepadv2Solution</code> +<p>You can see the solution to this exercise in <code>Notepadv2Solution</code> from the zip file to compare with your own.</p> <p>Now try editing a note, and then hitting the back button on the emulator instead of the confirm button (the back button is below the menu button). You diff --git a/docs/html/resources/tutorials/notepad/notepad-ex3.jd b/docs/html/resources/tutorials/notepad/notepad-ex3.jd index 8737280..2da113f 100644 --- a/docs/html/resources/tutorials/notepad/notepad-ex3.jd +++ b/docs/html/resources/tutorials/notepad/notepad-ex3.jd @@ -36,7 +36,7 @@ notes.</p> <ol> <li>Remove the code in <code>NoteEdit</code> that parses the title and body - from the extras Bundle. + from the extras Bundle. <p>Instead, we are going to use the <code>DBHelper</code> class to access the notes from the database directly. All we need passed into the NoteEdit Activity is a <code>mRowId</code> (but only if we are editing, if creating we pass @@ -57,7 +57,7 @@ if (body != null) { }</pre> </li> </ol> - + <h2>Step 2</h2> <p>Create a class field for a <code>NotesDbAdapter</code> at the top of the NoteEdit class:</p> @@ -67,11 +67,11 @@ if (body != null) { <pre> mDbHelper = new NotesDbAdapter(this);<br> mDbHelper.open();</pre> - + <h2>Step 3</h2> <p>In <code>NoteEdit</code>, we need to check the <var>savedInstanceState</var> for the -<code>mRowId</code>, in case the note +<code>mRowId</code>, in case the note editing contains a saved state in the Bundle, which we should recover (this would happen if our Activity lost focus and then restarted).</p> <ol> @@ -87,11 +87,11 @@ if (body != null) { </pre> with this: <pre> - mRowId = savedInstanceState != null ? savedInstanceState.getLong(NotesDbAdapter.KEY_ROWID) - : null; + mRowId = (savedInstanceState == null) ? null : + (Long) savedInstanceState.getSerializable(NotesDbAdapter.KEY_ROWID); if (mRowId == null) { - Bundle extras = getIntent().getExtras(); - mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) + Bundle extras = getIntent().getExtras(); + mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) : null; } </pre> @@ -100,10 +100,15 @@ if (body != null) { Note the null check for <code>savedInstanceState</code>, and we still need to load up <code>mRowId</code> from the <code>extras</code> Bundle if it is not provided by the <code>savedInstanceState</code>. This is a ternary operator shorthand - to safely either use the value or null if it is not present. + to safely either use the value or null if it is not present. + </li> + <li> + Note the use of <code>Bundle.getSerializable()</code> instead of + <code>Bundle.getLong()</code>. The latter encoding returns a <code>long</code> primitive and + so can not be used to represent the case when <code>mRowId</code> is <code>null</code>. </li> </ol> - + <h2>Step 4</h2> <p>Next, we need to populate the fields based on the <code>mRowId</code> if we @@ -126,38 +131,38 @@ public void onClick(View view) { }</pre> <p>We will take care of storing the updates or new notes in the database ourselves, using the life-cycle methods.</p> - + <p>The whole <code>onCreate()</code> method should now look like this:</p> <pre> super.onCreate(savedInstanceState); - + mDbHelper = new NotesDbAdapter(this); mDbHelper.open(); - + setContentView(R.layout.note_edit); - + mTitleText = (EditText) findViewById(R.id.title); mBodyText = (EditText) findViewById(R.id.body); - + Button confirmButton = (Button) findViewById(R.id.confirm); - -mRowId = savedInstanceState != null ? savedInstanceState.getLong(NotesDbAdapter.KEY_ROWID) - : null; + +mRowId = (savedInstanceState == null) ? null : + (Long) savedInstanceState.getSerializable(NotesDbAdapter.KEY_ROWID); if (mRowId == null) { Bundle extras = getIntent().getExtras(); - mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) + mRowId = extras != null ? extras.getLong(NotesDbAdapter.KEY_ROWID) : null; } - + populateFields(); - + confirmButton.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { setResult(RESULT_OK); finish(); } - + });</pre> <h2>Step 6</h2> @@ -180,7 +185,7 @@ is an Android convenience method provided to take care of the Cursor life-cycle. and re-create resources as dictated by the Activity life-cycle, so we don't need to worry about doing that ourselves. After that, we just look up the title and body values from the Cursor and populate the View elements with them.</p> - + <h2>Step 7</h2> @@ -189,12 +194,12 @@ and populate the View elements with them.</p> margin-top:1em;padding:0em;width:240px;"> <h2 style="border:0;font-size:12px;padding:.5em .5em .5em 1em;margin:0; background-color:#FFFFDD;">Why handling life-cycle events is important</h2> - <p style="padding-left:.5em;font-size:12px;margin:0; + <p style="padding-left:.5em;font-size:12px;margin:0; padding:.0em .5em .5em 1em;">If you are used to always having control in your applications, you might not understand why all this life-cycle work is necessary. The reason - is that in Android, you are not in control of your Activity, the + is that in Android, you are not in control of your Activity, the operating system is!</p> - <p style="padding-left:.5em;font-size:12px;margin:0; + <p style="padding-left:.5em;font-size:12px;margin:0; padding:.0em .5em .5em 1em;">As we have already seen, the Android model is based around activities calling each other. When one Activity calls another, the current Activity is paused at the very least, and may be killed altogether if the @@ -209,9 +214,9 @@ and populate the View elements with them.</p> out while the call Activity takes over.</p> </div> -<p>Still in the <code>NoteEdit</code> class, we now override the methods - <code>onSaveInstanceState()</code>, <code>onPause()</code> and - <code>onResume()</code>. These are our life-cycle methods +<p>Still in the <code>NoteEdit</code> class, we now override the methods + <code>onSaveInstanceState()</code>, <code>onPause()</code> and + <code>onResume()</code>. These are our life-cycle methods (along with <code>onCreate()</code> which we already have).</p> <p><code>onSaveInstanceState()</code> is called by Android if the @@ -241,8 +246,10 @@ and populate the View elements with them.</p> @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); - outState.putLong(NotesDbAdapter.KEY_ROWID, mRowId); + saveState(); + outState.putSerializable(NotesDbAdapter.KEY_ROWID, mRowId); }</pre> + <p>We'll define <code>saveState()</code> next.</p> </li> <li><code> onPause()</code>: @@ -252,7 +259,6 @@ and populate the View elements with them.</p> super.onPause(); saveState(); }</pre> - <p>We'll define <code>saveState()</code> next.</p> </li> <li><code> onResume()</code>: @@ -264,6 +270,10 @@ and populate the View elements with them.</p> }</pre> </li> </ol> +<p>Note that <code>saveState()</code> must be called in both <code>onSaveInstanceState()</code> +and <code>onPause()</code> to ensure that the data is saved. This is because there is no +guarantee that <code>onSaveInstanceState()</code> will be called and because when it <em>is</em> +called, it is called before <code>onPause()</code>.</p> <h2 style="clear:right;">Step 8</h2> @@ -301,19 +311,18 @@ database.</p> necessary. The resulting method should look like this:</p> <pre> @Override -protected void onActivityResult(int requestCode, int resultCode, - Intent intent) { +protected void onActivityResult(int requestCode, int resultCode, Intent intent) { super.onActivityResult(requestCode, resultCode, intent); fillData(); }</pre> <p>Because the other class now does the work, all this has to do is refresh the data.</p> - + <h2>Step 10</h2> <p>Also remove the lines which set the title and body from the - <code>onListItemClick()</code> method (again they are no longer needed, + <code>onListItemClick()</code> method (again they are no longer needed, only the <code>mRowId</code> is):</p> <pre> Cursor c = mNotesCursor; @@ -344,13 +353,13 @@ so that all that should be left in that method is: other occurrences of <code>mNotesCursor</code> in your <code>fillData()</code> method. </ol> <p> -Run it! (use <em>Run As -> Android Application</em> on the project right +Run it! (use <em>Run As -> Android Application</em> on the project right click menu again)</p> <h2>Solution and Next Steps</h2> <p>You can see the solution to this exercise in <code>Notepadv3Solution</code> -from +from the zip file to compare with your own.</p> <p> When you are ready, move on to the <a href="notepad-extra-credit.html">Tutorial diff --git a/docs/html/sdk/1.5_r3/upgrading.jd b/docs/html/sdk/1.5_r3/upgrading.jd index f853d25..18c1314 100644 --- a/docs/html/sdk/1.5_r3/upgrading.jd +++ b/docs/html/sdk/1.5_r3/upgrading.jd @@ -174,7 +174,7 @@ uninstall procedure and continue to <a href="#installAdt">Install the 0.9 ADT pl <ol> <li>Select <strong>Help</strong> > <strong>Software Updates</strong>.</li> <li>Select the <strong>Available Software</strong> tab.</li> - <li>Expand the entry for the Andriod plugin (may be listed as the location URL) + <li>Expand the entry for the Android plugin (may be listed as the location URL) and select "Developer Tools" by checking the box next to it, then click <strong>Install</strong>.</li> <li>On the next window, "Android DDMS" and "Android Development Tools" @@ -272,7 +272,7 @@ first target ("1"), which uses the Android 1.1 platform library.</p> your AIDL Java files will be generated in here. You <strong>must</strong> remove the old <code>R.java</code> and old auto-generated AIDL java files from the <code>src/</code> folder. (This -does not apply to your own hand-crafted parcelabe AIDL java files.)</p> +does not apply to your own hand-crafted parcelable AIDL java files.)</p> <p class="note"><strong>Note:</strong> The "activitycreator" tool has been replaced by the new "android" tool. For information on creating new projects with the android tool, @@ -368,7 +368,7 @@ if it performs any of the following:</p> listens for special keypress events that only occur on a keypad, then your application should degrade gracefully when there is no keyboard available. </li> - <li>Performs its own layout orientation changes based on the acceletometer (or via other + <li>Performs its own layout orientation changes based on the accelerometer (or via other sensors). Some devices running Android 1.5 will automatically rotate the orientation (and all devices have the option to turn on auto-rotation), so if your application also attempts to rotate the orientation, it can result in strange behavior. In addition, if your diff --git a/docs/html/sdk/RELEASENOTES.jd b/docs/html/sdk/RELEASENOTES.jd index 2c1d495..ae86a4b 100644 --- a/docs/html/sdk/RELEASENOTES.jd +++ b/docs/html/sdk/RELEASENOTES.jd @@ -328,7 +328,7 @@ changes include: </p> <ul> <li>Multiple versions of the Android platform are included (Android 1.1, Android 1.5). The tools are updated to let you deploy your application -on any platform in the SDK, which helps you ensure forward-compitility and, +on any platform in the SDK, which helps you ensure forward-compatibility and, if applicable, backward-compatibility.</li> <li>Introduces <a href="{@docRoot}guide/developing/tools/avd.html">Android Virtual Devices</a> — (AVD) configurations of options that you @@ -339,7 +339,7 @@ that are running concurrently.</li> Android SDK to give you access to one or more external Android libraries and/or a customized (but compliant) system image that can run in the emulator. </li> <li>The new Eclipse ADT plugin (version 0.9.x) offers new Wizards to let you -create projects targetted for specific Android configurations, generate XML +create projects targeted for specific Android configurations, generate XML resources (such as layouts, animations, and menus), generate alternate layouts, and export and sign your application for publishing.</li> <li>Improved JUnit support in ADT</li> @@ -655,9 +655,9 @@ href="{@docRoot}sdk/eclipse-adt.html">Installing and Updating ADT</a>.</p> <h3>Other Notes</h3> -<p><strong>T-Mobile G1 Compatability</strong></p> +<p><strong>T-Mobile G1 Compatibility</strong></p> -<p>This version of the SDK has been tested for compatability with the first +<p>This version of the SDK has been tested for compatibility with the first Android-powered mobile device, the <a href="http://www.t-mobileg1.com">T-Mobile G1</a>. </p> diff --git a/docs/html/sdk/ndk/1.5_r1/index.jd b/docs/html/sdk/ndk/1.5_r1/index.jd index 7ccbbcd..16d543d 100644 --- a/docs/html/sdk/ndk/1.5_r1/index.jd +++ b/docs/html/sdk/ndk/1.5_r1/index.jd @@ -146,7 +146,7 @@ Applications</a>.</p> <p>The sections below describe the system and software requirements for using the Android NDK, as well as platform compatibility considerations that affect -appplications using libraries produced with the NDK. </p> +applications using libraries produced with the NDK. </p> <h4>The Android SDK</h4> <ul> diff --git a/docs/html/videos/index.jd b/docs/html/videos/index.jd index 4e53aac..157c077 100644 --- a/docs/html/videos/index.jd +++ b/docs/html/videos/index.jd @@ -98,7 +98,7 @@ function renderPlaylist(data) { // Check whether this playlist includes the video title inside the description meta-data, so we can remove it if (playlistsWithTitleInDescription.indexOf(playlistId) != -1) { var lines = fullDescription.split("\n"); - // If the first line includes the first 17 chars from the title, let's use the title from the desciption instead (because it's a more complete title) + // If the first line includes the first 17 chars from the title, let's use the title from the description instead (because it's a more complete title) // This accounts for, literally, "Google I/O 2009 -", which is (so far) the min AND max for properly identifying a title in the only playlist with titles in the description if (lines[0].indexOf(title.slice(0,16)) != -1) { h3Title = "<h3>" + lines[0] + "</h3>"; @@ -332,7 +332,7 @@ function clickDefaultVideo() { <script type="text/javascript"> // Initialization actions showFeatured(); // load featured videos -showPlaylists(); // load playslists +showPlaylists(); // load playlists </script> -
\ No newline at end of file + |