summaryrefslogtreecommitdiffstats
path: root/docs/html/training/basics/firstapp
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-10-11 14:37:59 -0700
committerScott Main <smain@google.com>2012-10-12 13:11:56 -0700
commitda02c6422ff01f7e16fc3f08182876361c93db71 (patch)
treef72caca7f095b6442a9211d36c61f02016aa64ba /docs/html/training/basics/firstapp
parent1cd614c62c400091093a662cd331d268991f9e3f (diff)
downloadframeworks_base-da02c6422ff01f7e16fc3f08182876361c93db71.zip
frameworks_base-da02c6422ff01f7e16fc3f08182876361c93db71.tar.gz
frameworks_base-da02c6422ff01f7e16fc3f08182876361c93db71.tar.bz2
update info about usb debugging for mr1 changes
bug: 7333465 bug: 7318666 Change-Id: If657d5c31f3c0d418448d916d22ce865b2691db2
Diffstat (limited to 'docs/html/training/basics/firstapp')
-rw-r--r--docs/html/training/basics/firstapp/running-app.jd23
1 files changed, 16 insertions, 7 deletions
diff --git a/docs/html/training/basics/firstapp/running-app.jd b/docs/html/training/basics/firstapp/running-app.jd
index 0c428e7..80603b2 100644
--- a/docs/html/training/basics/firstapp/running-app.jd
+++ b/docs/html/training/basics/firstapp/running-app.jd
@@ -40,7 +40,7 @@ Android project, it includes a default set of "Hello World" source files that al
immediately run the app.</p>
<p>How you run your app depends on two things: whether you have a real Android-powered device and
-whether you’re using Eclipse. This lesson shows you how to install and run your app on a
+whether you're using Eclipse. This lesson shows you how to install and run your app on a
real device and on the Android emulator, and in both cases with either Eclipse or the command line
tools.</p>
@@ -85,12 +85,21 @@ important that you understand how to run your app before you start developing.</
<ol>
<li>Plug in your device to your development machine with a USB cable.
-If you’re developing on Windows, you might need to install the appropriate USB driver for your
+If you're developing on Windows, you might need to install the appropriate USB driver for your
device. For help installing drivers, see the <a href="{@docRoot}tools/extras/oem-usb.html">OEM USB
-Drivers</a> document.</li>
- <li>Ensure that <strong>USB debugging</strong> is enabled in the device Settings (open Settings
-and navitage to <strong>Applications > Development</strong> on most devices, or click
-<strong>Developer options</strong> on Android 4.0 and higher).</li>
+Drivers</a> document.</li>
+ <li>Enable <strong>USB debugging</strong> on your device.
+ <ul>
+ <li>On most devices running Android 3.2 or older, you can find the option under
+ <strong>Settings > Applications > Development</strong>.</li>
+ <li>On Android 4.0 and newer, it's in <strong>Settings > Developer options</strong>.
+ <p class="note"><strong>Note:</strong> On Android 4.2 and newer, <strong>Developer
+ options</strong> is hidden by default. To make it available, go
+ to <strong>Settings > About phone</strong> and tap <strong>Build number</strong>
+ seven times. Return to the previous screen to find <strong>Developer options</strong>.</p>
+ </li>
+ </ul>
+ </li>
</ol>
<p>To run the app from Eclipse, open one of your project's files and click
@@ -118,7 +127,7 @@ lesson</a>.</p>
<h2 id="Emulator">Run on the Emulator</h2>
-<p>Whether you’re using Eclipse or the command line, to run your app on the emulator you need to
+<p>Whether you're using Eclipse or the command line, to run your app on the emulator you need to
first create an <a href="{@docRoot}tools/devices/index.html">Android Virtual Device</a> (AVD). An
AVD is a device configuration for the Android emulator that allows you to model different
devices.</p>