summaryrefslogtreecommitdiffstats
path: root/docs/html/tools/building
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/tools/building
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/tools/building')
-rw-r--r--docs/html/tools/building/building-cmdline.jd14
-rw-r--r--docs/html/tools/building/building-eclipse.jd14
2 files changed, 24 insertions, 4 deletions
diff --git a/docs/html/tools/building/building-cmdline.jd b/docs/html/tools/building/building-cmdline.jd
index 6154d96..e0d0d3f 100644
--- a/docs/html/tools/building/building-cmdline.jd
+++ b/docs/html/tools/building/building-cmdline.jd
@@ -261,8 +261,18 @@ adb -s emulator-5554 install <em>path/to/your/app</em>.apk
device:</p>
<ul>
- <li>Enable USB Debugging on your device. You can find the setting on most Android devices by
- going to <strong>Settings > Applications > Development > USB debugging</strong>.</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>
<li>Ensure that your development computer can detect your device when connected via USB</li>
</ul>
diff --git a/docs/html/tools/building/building-eclipse.jd b/docs/html/tools/building/building-eclipse.jd
index c73fe97..304aa7e 100644
--- a/docs/html/tools/building/building-eclipse.jd
+++ b/docs/html/tools/building/building-eclipse.jd
@@ -84,8 +84,18 @@ parent.link=index.html
<code>android:debuggable</code> attribute of the <code>&lt;application&gt;</code>
element to <code>true</code>. As of ADT 8.0, this is done by default when you build in debug mode.</li>
- <li>Enable USB Debugging on your device. You can find the setting on most Android devices by
- going to <strong>Settings > Applications > Development > USB debugging</strong>.</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>
<li>Ensure that your development computer can detect your device when connected via USB</li>
</ul>