diff options
Diffstat (limited to 'docs/html/training/basics')
| -rw-r--r-- | docs/html/training/basics/firstapp/starting-activity.jd | 2 | ||||
| -rw-r--r-- | docs/html/training/basics/intents/sending.jd | 6 | ||||
| -rw-r--r-- | docs/html/training/basics/network-ops/managing.jd | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd index cbd063a..4d0a84a 100644 --- a/docs/html/training/basics/firstapp/starting-activity.jd +++ b/docs/html/training/basics/firstapp/starting-activity.jd @@ -226,7 +226,7 @@ the original {@code MainActivity.java} file.</p> <p>Open the {@code DisplayMessageActivity.java} file. If you used Eclipse to create it, the class already includes an implementation of the required {@link android.app.Activity#onCreate onCreate()} -method. There's also an implemtation of the {@link android.app.Activity#onCreateOptionsMenu +method. There's also an implementation of the {@link android.app.Activity#onCreateOptionsMenu onCreateOptionsMenu()} method, but you won't need it for this app so you can remove it. The class should look like this:</p> diff --git a/docs/html/training/basics/intents/sending.jd b/docs/html/training/basics/intents/sending.jd index 77f0e1a..37a06f1 100644 --- a/docs/html/training/basics/intents/sending.jd +++ b/docs/html/training/basics/intents/sending.jd @@ -31,11 +31,11 @@ next.link=result.html <p>One of Android's most important features is an app's ability to send the user to another app based on an "action" it would like to perform. For example, if your app has the address of a business that you'd like to show on a map, you don't have to build -an activity in your app that shows a map. Instead, you can send a out a request to view the address -using an {@link android.content.Intent}. The Android system then starts an app that's able to view +an activity in your app that shows a map. Instead, you can create a request to view the address +using an {@link android.content.Intent}. The Android system then starts an app that's able to show the address on a map.</p> -<p>As shown in the first class, <a href="{@docRoot}training/basics/firstapp/index.html">Building +<p>As explained in the first class, <a href="{@docRoot}training/basics/firstapp/index.html">Building Your First App</a>, you must use intents to navigate between activities in your own app. You generally do so with an <em>explicit intent</em>, which defines the exact class name of the component you want to start. However, when you want to have a separate app perform an action, such diff --git a/docs/html/training/basics/network-ops/managing.jd b/docs/html/training/basics/network-ops/managing.jd index 33cb195..0f3d495 100644 --- a/docs/html/training/basics/network-ops/managing.jd +++ b/docs/html/training/basics/network-ops/managing.jd @@ -116,7 +116,7 @@ background data.</p> follows. The method {@link android.net.ConnectivityManager#getActiveNetworkInfo() getActiveNetworkInfo()} returns a {@link android.net.NetworkInfo} instance representing the first -connected network interface it can find, or <code>null</code> if none if the +connected network interface it can find, or <code>null</code> if none of the interfaces is connected (meaning that an internet connection is not available):</p> |