summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatie McCormick <kmccormick@google.com>2011-11-03 00:43:08 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-03 00:43:08 +0000
commit4473097193a853edf3c63ba0a62d1d763a8b4379 (patch)
tree7bea8235c7ec31e480a630737688e764cd00019f
parente40b7136bf2718286482d15c410e43827f4dac91 (diff)
parent31a05f336ac99ab4ecfb5e227aca40f8fc7140cb (diff)
downloadframeworks_base-4473097193a853edf3c63ba0a62d1d763a8b4379.zip
frameworks_base-4473097193a853edf3c63ba0a62d1d763a8b4379.tar.gz
frameworks_base-4473097193a853edf3c63ba0a62d1d763a8b4379.tar.bz2
am 31a05f33: Doc change: Update instructions to match ICS UI
* commit '31a05f336ac99ab4ecfb5e227aca40f8fc7140cb': Doc change: Update instructions to match ICS UI
-rw-r--r--docs/html/guide/developing/device.jd11
1 files changed, 7 insertions, 4 deletions
diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd
index 9ce3649..deb7a2d 100644
--- a/docs/html/guide/developing/device.jd
+++ b/docs/html/guide/developing/device.jd
@@ -58,14 +58,17 @@ would on the emulator. Before you can start, there are just a few things to do:<
element.</p>
</li>
<li>Set up your device to allow installation of non-Market applications. <p>On
-the device, go to <strong>Settings > Applications</strong> and enable
+the device, go to <strong>Settings > Applications</strong> and enable
-<strong>Unknown sources</strong>.</p>
+<strong>Unknown sources</strong> (on an Android 4.0 device, the setting is
+located in <strong>Settings > Security</strong>).</p>
</li>
<li>Turn on "USB Debugging" on your device.
- <p>On the device, go to <strong>Settings > Applications > Development</strong>
- and enable <strong>USB debugging</strong>.</p>
+ <p>On the device, go to <strong>Settings > Applications > Development</strong>
+ and enable <strong>USB debugging</strong>
+ (on an Android 4.0 device, the setting is
+located in <strong>Settings > Developer options</strong>).</p>
</li>
<li>Set up your system to detect your device.
<ul>