summaryrefslogtreecommitdiffstats
path: root/docs/html/tools
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/tools')
-rw-r--r--docs/html/tools/building/building-cmdline.jd14
-rw-r--r--docs/html/tools/building/building-eclipse.jd14
-rw-r--r--docs/html/tools/device.jd16
-rw-r--r--docs/html/tools/index.jd71
4 files changed, 83 insertions, 32 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>
diff --git a/docs/html/tools/device.jd b/docs/html/tools/device.jd
index d5fd581..61cd08a 100644
--- a/docs/html/tools/device.jd
+++ b/docs/html/tools/device.jd
@@ -58,11 +58,17 @@ the <code>&lt;application></code> element.</p>
<p class="note"><strong>Note:</strong> If you manually enable debugging in the manifest
file, be sure to disable it before you build for release (your published application
should usually <em>not</em> be debuggable).</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>
- (on an Android 4.0 device, the setting is
-located in <strong>Settings > Developer options</strong>).</p>
+ <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>Set up your system to detect your device.
<ul>
diff --git a/docs/html/tools/index.jd b/docs/html/tools/index.jd
index 04e0d3b..38401aa 100644
--- a/docs/html/tools/index.jd
+++ b/docs/html/tools/index.jd
@@ -17,68 +17,88 @@ page.title=Developer Tools
<div style="margin-top:20px;"></div>
-<div class="col-6">
+<div class="col-7" style="margin-left:0">
<h3>Full Java IDE</h3>
<ul>
- <li>Android-specific refactoring, quick fixes, integrated navigation between Java and Android XML resources.</li>
- <li>Enhanced XML editors for Android XML resources</li>
- <li>Static analysis tools to catch performance, usability, and correctness problems</li>
+ <li>Android-specific refactoring, quick fixes, integrated navigation between Java and XML resources.</li>
+ <li>Enhanced XML editors for Android XML resources.</li>
+ <li>Static analysis tools to catch performance, usability, and correctness problems.</li>
<li>Build support for complex projects, command-line support for CI through Ant. Includes ProGuard and app-signing. </li>
<li>Template-based wizard to create standard Android projects and components.</li>
</ul>
</div>
-<div class="col-6">
+
+<div class="col-6" style="margin-right:0">
+
<h3>Graphical UI Builders</h3>
-
<ul>
<li>Build rich Android UI with drag and drop.
<li>Visualize your UI on tablets, phones, and other devices. Switch themes, locales, even platform versions instantly, without building.</li>
- <li>Visual refactoring lets you extracts layout for inclusion, convert layouts, extract styles</li>
- <li>Editor support for working with custom UI components</li>
+ <li>Visual refactoring lets you extracts layout for inclusion, convert layouts, extract styles.</li>
+ <li>Editor support for working with custom UI components.</li>
</ul>
+
+</div>
+
+
+<div class="col-7" style="clear:both;margin-left:0;">
+
+<h3>On-device Developer Options</h3>
+<ul>
+ <li>Enable debugging over USB.</li>
+ <li>Quickly capture bug reports onto the device.</li>
+ <li>Show CPU usage on screen.</li>
+ <li>Draw debugging information on screen such as layout bounds,
+ updates on GPU views and hardware layers, touch location, and others.</li>
+ <li>Plus many more options to simulate app stresses or enable debugging options.</li>
+</ul>
+<p>To access these on your device, open the <em>Developer options</em> in the
+system Settings. Note that on Android 4.2 and higher, the Developer options screen is
+hidden by default. To make it available, go to
+<b>Settings > About phone</b> and tap <b>Build number</b> seven times. Return to the previous
+screen to find Developer options.</p>
+
</div>
-<div class="col-6" style="clear:both">
+<div class="col-6" style="margin-right:0">
+ <img src="{@docRoot}images/tools/dev-options-inmilk.png" alt="" style="margin:-10px 0 0;">
+</div>
+
+
+<div class="col-7" style="clear:both;margin-left:0;">
<h3>Develop on Hardware Devices</h3>
<ul>
<li>Use any commercial Android hardware device or multiple devices.</li>
- <li>Deploy your app to connected devices directy from the IDE</li>
- <li>Live, on-device debugging, testing, and profiling</li>
+ <li>Deploy your app to connected devices directy from the IDE.</li>
+ <li>Live, on-device debugging, testing, and profiling.</li>
</ul>
</div>
-<div class="col-6">
+<div class="col-6" style="margin-right:0">
<h3>Develop on Virtual Devices</h3>
<ul>
<li>Emulate any device. Use custom screen sizes, keyboards, and other hardware components. </li>
<li>Advanced hardware emulation, including camera, sensors, multitouch, telephony.</li>
- <li>Develop and test for broadest compatibility at lowest cost.</li>
+ <li>Develop and test for broad device compatibility.</li>
</ul>
</div>
<div style="margin-top:20px;"></div>
-<div class="col-5">
+<div class="col-7" style="margin-left:0">
<h3>Powerful Debugging</h3>
<ul>
- <li>Full Java debugger with on-device debugging and Android-specific tools</li>
+ <li>Full Java debugger with on-device debugging and Android-specific tools.</li>
<li>Built-in memory analysis, performance/CPU profiling, OpenGL ES tracing.</li>
<li>Graphical tools for debugging and optimizing UI, runtime inspecton of UI structure and performance.</li>
- <li>Runtime graphical analysis of your app's network bandwidth usage.</li>
+ <li>Runtime graphical analysis of your app's network bandwidth usage.</li>
</ul>
-</div>
-
-<div style="float:right;width:360px;padding-top:1em;">
- <img src="{@docRoot}images/debugging-tall.png" align="left">
-</div>
-
-<div class="col-6">
<h3>Testing</h3>
<ul>
@@ -95,3 +115,8 @@ page.title=Developer Tools
</ul>
</div>
+<div class="col-6" style="margin-right:0">
+ <img src="{@docRoot}images/debugging-tall.png" align="left" style="margin-top:10px">
+</div>
+
+