summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorKatie McCormick <kmccormick@google.com>2011-11-02 15:42:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-11-02 15:42:18 -0700
commite08be659eba742d117d24f642a95ba65e13bd015 (patch)
treee2d4fa8a8e3ce06eadd59d3b899c410f343f5d58 /docs
parent7f00c22b7fa7b38b644585c0a3c6faadc5def94c (diff)
parent0d842cc9182878e7a08c47d9a251dee45a385fcd (diff)
downloadframeworks_base-e08be659eba742d117d24f642a95ba65e13bd015.zip
frameworks_base-e08be659eba742d117d24f642a95ba65e13bd015.tar.gz
frameworks_base-e08be659eba742d117d24f642a95ba65e13bd015.tar.bz2
Merge "Doc change: Update instructions to match ICS UI" into ics-mr0
Diffstat (limited to 'docs')
-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>