Merge "docs: Tools docs reorganization, round 1b" into mnc-docs

9 files changed, 293 insertions, 351 deletions

diff --git a/docs/html/sdk/installing/create-project.jd b/docs/html/sdk/installing/create-project.jd
index c44f401bafc4..a4de85ceb7e2 100644
--- a/docs/html/sdk/installing/create-project.jd
+++ b/docs/html/sdk/installing/create-project.jd
@@ -1,4 +1,4 @@
-page.title=Managing Projects from Android Studio
+page.title=Managing Projects with Android Studio
 
 @jd:body
 
@@ -8,13 +8,6 @@ page.title=Managing Projects from Android Studio
 
       <ol>
         <li><a href="#CreatingAProject">Creating an Android Project</a></li>
-        <ol>
-          <li><a href="#Step1CreatingAProject">Create a New Project</a> </li>
-          <li><a href="#Step2SelectFormFactor">Select Form Factors and API Level</a> </li>
-          <li><a href="#Step3AddActivity">Add an Activity</a> </li>
-          <li><a href="#Step4ConfigureActivity">Configure Your App</a> </li>
-          <li><a href="#Step5DevelopYourApp">Develop Your App</a> </li>
-        </ol>
 
         <li><a href="#CreatingAModule">Creating an Android Module</a></li>
 
@@ -359,10 +352,6 @@ Android project view:</p>
 per resource type.</li>
 </ul>
 
-
-
-<h2 id="enable-view">Use the Android Project View</h2>
-
 <p>The <em>Android</em> project view is enabled by default and shows all the build files at
 the top level of the project hierarchy under <strong>Gradle Scripts</strong>. The project module
 appears as a folder at the top level of the project hierarchy and contains these three elements
@@ -386,12 +375,3 @@ from this representation and maintains the traditional project structure.</p>
 &nbsp;&nbsp;&nbsp;
 <img src="{@docRoot}images/tools/projectview-p2.png" alt="" style="width:240px" " />
 <p class="img-caption"><strong>Figure 10:</strong> Android and Traditional project view </p>
-
-
-
-
-
-
-
-
-
diff --git a/docs/html/tools/debugging/debugging-devtools.jd b/docs/html/tools/debugging/debugging-devtools.jd
deleted file mode 100644
index 3a051200422b..000000000000
--- a/docs/html/tools/debugging/debugging-devtools.jd
+++ /dev/null
@@ -1,77 +0,0 @@
-page.title=Using the Dev Tools App
-parent.title=Debugging
-parent.link=index.html
-@jd:body
-
-<p>The Dev Tools application is installed by default on all system images included with the SDK,
-  so you can use it with the Android Emulator. With the Dev Tools application, you can enable a
-  number of settings on your device that will make it easier to test and debug your applications.</p>
-
-  <p> The Dev Tools application relies on a number of permissions that are not available for
-  third party applications. If you'd like to install the Dev Tools application
-  on a real development device, you'd have to build a system image for that device and sign
-  the Dev Tools application with the same key as used for the system image.</p>
-
-  <p>To get started, launch the Dev Tools application and select <strong>Development Settings</strong>. This will
-  open the Development Settings page with the following options (among others):</p>
-
-  <dl>
-    <dt><strong>Debug app</strong></dt>
-
-    <dd>
-      Lets you select the application to debug. You do not need to set this to attach a debugger,
-      but setting this value has two effects:
-
-      <ul>
-        <li>It will prevent Android from throwing an error if you pause on a breakpoint for a long
-        time while debugging.</li>
-
-        <li>It will enable you to select the <em>Wait for Debugger</em> option to pause application
-        startup until your debugger attaches (described next).</li>
-      </ul>
-    </dd>
-
-    <dt><strong>Wait for debugger</strong></dt>
-
-    <dd>Blocks the selected application from loading until a debugger attaches. This way you can
-    set a breakpoint in {@link android.app.Activity#onCreate onCreate()}, 
-    which is important to debug the startup process of an Activity.
-    When you change this option, any currently running instances of the selected application will
-    be killed. In order to check this box, you must have selected a debug application as described
-    in the previous option. You can do the same thing by adding {@link
-    android.os.Debug#waitForDebugger()} to your code.</dd>
-
-    <dt><strong>Show screen updates</strong></dt>
-
-    <dd>Flashes a momentary pink rectangle on any screen sections that are being redrawn. This is
-    very useful for discovering unnecessary screen drawing.</dd>
-
-    <dt><strong>Immediately destroy activities</strong></dt>
-
-    <dd>Tells the system to destroy an activity as soon as it is stopped (as if Android had to
-    reclaim memory).&nbsp; This is very useful for testing the {@link
-    android.app.Activity#onSaveInstanceState} / {@link
-    android.app.Activity#onCreate(android.os.Bundle)} code path, which would otherwise be difficult
-    to force. Choosing this option will probably reveal a number of problems in your application
-    due to not saving state. For more information about saving an activity's state, see the
-    <a href="{@docRoot}guide/components/activities.html#SavingActivityState">Activities</a>
-document.</dd>
-
-    <dt><strong>Show CPU usage</strong></dt>
-
-    <dd>Displays CPU meters at the top of the screen, showing how much the CPU is being used. The
-    top red bar shows overall CPU usage, and the green bar underneath it shows the CPU time spent
-    in compositing the screen. 
-    <p class="note">Note: You cannot turn this feature off once it is on, without
-    restarting the emulator.</p></dd>
-
-    <dt><strong>Show background</strong></dt>
-
-    <dd>Displays a background pattern when no activity screens are visible. This typically does not
-    happen, but can happen during debugging.</dd>
-  </dl>
-
-  <p>These settings will be remembered across emulator restarts.</p>
-
-
-
diff --git a/docs/html/tools/debugging/debugging-log.jd b/docs/html/tools/debugging/debugging-log.jd
index d2baaf26ce84..42b307c54cdf 100644
--- a/docs/html/tools/debugging/debugging-log.jd
+++ b/docs/html/tools/debugging/debugging-log.jd
@@ -1,6 +1,5 @@
 page.title=Reading and Writing Logs
-parent.title=Debugging
-parent.link=index.html
+
 @jd:body
 
 <div id="qv-wrapper">
@@ -8,8 +7,6 @@ parent.link=index.html
       <h2>In this document</h2>
 
       <ol>
-        <li><a href="#logClass">The Log class</a></li>
-
         <li><a href="#startingLogcat">Starting LogCat</a></li>
 
         <li><a href="#filteringOutput">Filtering Log Output</a></li>
@@ -20,7 +17,7 @@ parent.link=index.html
 
         <li><a href="#viewingStd">Viewing stdout and stderr</a></li>
 
-        <li><a href="#DebuggingWebPages">Debugging Web Pages</a></li>
+        <li><a href="#logClass">Logging from Code</a></li>
       </ol>
     </div>
   </div>
@@ -31,31 +28,6 @@ parent.link=index.html
   {@link android.util.Log} class. You can run LogCat through ADB or from DDMS, which allows you to
   read the messages in real time.</p>
 
-  <h2 id="logClass">The <code>Log</code> class</h2>
-
-  <p>{@link android.util.Log} is a logging class that you can utilize in your code to print out
-  messages to the LogCat. Common logging methods include:</p>
-
-  <ul>
-    <li>{@link android.util.Log#v(String,String)} (verbose)</li>
-
-    <li>{@link android.util.Log#d(String,String)} (debug)</li>
-
-    <li>{@link android.util.Log#i(String,String)} (information)</li>
-
-    <li>{@link android.util.Log#w(String,String)} (warning)</li>
-
-    <li>{@link android.util.Log#e(String,String)} (error)</li>
-  </ul>For example:
-  <pre class="no-pretty-print">
-Log.i("MyActivity", "MyClass.getView() &mdash; get item number " + position);
-</pre>
-
-  <p>The LogCat will then output something like:</p>
-  <pre class="no-pretty-print">
-I/MyActivity( 1557): MyClass.getView() &mdash; get item number 1
-</pre>
-
   <h2 id="startingLogcat">Using LogCat</h2>
 
   <p>You can use LogCat from within DDMS or call it on an ADB shell. For more information on how to
@@ -301,8 +273,35 @@ $ adb shell start
   setting as a default on the emulator/device instance, you can add an entry to
   <code>/data/local.prop</code> on the device.</p>
 
-  <h2 id="DebuggingWebPages">Debugging Web Apps</h2>
-  <p>
-  If you're developing a web application for Android, you can debug your JavaScript using the console JavaScript APIs,
-  which output messages to LogCat. For more information, see
-  <a href="{@docRoot}guide/webapps/debugging.html">Debugging Web Apps</a>.</p>
+  <h2 id="logClass">Logging from Code</h2>
+
+  <p>The {@link android.util.Log} class allows you to create log entries in your code that display
+  in the LogCat tool. Common logging methods include:</p>
+
+  <ul>
+    <li>{@link android.util.Log#v(java.lang.String, java.lang.String)
+      Log.v(String, String)} (verbose)</li>
+
+    <li>{@link android.util.Log#d(java.lang.String, java.lang.String)
+      Log.d(String, String)} (debug)</li>
+
+    <li>{@link android.util.Log#i(java.lang.String, java.lang.String)
+      Log.i(String, String)} (information)</li>
+
+    <li>{@link android.util.Log#w(java.lang.String, java.lang.String)
+      Log.w(String, String)} (warning)</li>
+
+    <li>{@link android.util.Log#e(java.lang.String, java.lang.String)
+      Log.e(String, String)} (error)</li>
+  </ul>
+
+  <p>For example, using the following call:</p>
+
+  <pre class="no-pretty-print">
+Log.i("MyActivity", "MyClass.getView() &mdash; get item number " + position);
+</pre>
+
+  <p>The LogCat outputs something like:</p>
+  <pre class="no-pretty-print">
+I/MyActivity( 1557): MyClass.getView() &mdash; get item number 1
+</pre>
diff --git a/docs/html/tools/debugging/debugging-projects-cmdline.jd b/docs/html/tools/debugging/debugging-projects-cmdline.jd
deleted file mode 100644
index 032d6ce6f9ba..000000000000
--- a/docs/html/tools/debugging/debugging-projects-cmdline.jd
+++ /dev/null
@@ -1,78 +0,0 @@
-page.title=Debugging from Other IDEs
-parent.title=Debugging
-parent.link=index.html
-@jd:body
-
-
- <div id="qv-wrapper">
-    <div id="qv">
-      <h2>In this document</h2>
-
-      <ol>
-        <li><a href="#start-debugging">Starting a Debugging Environment</a>
-        <ul>
-          <li><a href="#debuggingPort">Configuring Your IDE to Attach to the Debugging Port</a></li>
-        </ul>
-        </li>
-      </ol>
-    </div>
-  </div>
- 
-  <p>If you are not using Android Studio to develop, you can still take advantage of all the tools that
-  the Android SDK provides for debugging. A basic debugging environment consists of:</p>
-
-  <ul>
-    <li><a href="{@docRoot}tools/help/adb.html">ADB</a></li>
-
-    <li><a href="{@docRoot}tools/debugging/ddms.html">DDMS</a></li>
-
-    <li>Java Debugger</li>
-  </ul>
-  
-  <p>You need to obtain a JDWP-compliant Java debugger to properly debug your application.
-  Most Java IDEs will already have one included, or you can use a command line debugger,
-  such as JDB, if you are using a simple text editor to develop applications.</p>
-
-  <h2 id="start-debugging">Starting a debugging environment</h2>
-  <p>A Java Debugger assists you in finding problems with
-  your code by letting you set breakpoints, step through execution of your application, and examine
-  variable values. Since you are not using Android Studio, you have to manually start up the debugging
-  environment yourself by running a few tools that are provided in the Android SDK. To begin
-  debugging your application, follow these general steps:</p>
-
-  <ol>
-    <li>Load an AVD with the Android emulator or connect a device to your computer.</li>
-    
-    <li>Start DDMS from the sdk <code>/tools</code> directory. This also starts ADB if it is 
-    not already started. You should see your device appear in DDMS.</li>
-
-    <li>Install and run your <code>.apk</code> file on the device or emulator. In DDMS, you should
-    see your application running under the device that you installed it to.</li>
-
-    <li>Attach your debugger to the debugging port 8700, or to the specific port shown for the
-    application in DDMS.</li>
-  </ol>
-
-  <h3 id="debuggingPort">Configuring Your IDE to Attach to the Debugging Port</h3>
-
-  <p>DDMS assigns a specific debugging port to every virtual machine that it finds on the
-  emulator. You must either attach your IDE to that port (listed on the Info tab for that VM), or
-  you can use a default port 8700 to connect to whatever application is currently selected on the
-  list of discovered virtual machines.</p>
-
-  <p>Your IDE should attach to your application running on the emulator, showing you its threads
-  and allowing you to suspend them, inspect their state, and set breakpoints. If you selected "Wait
-  for debugger" in the Development settings panel the application will run when Android Studio connects,
-  so you will need to set any breakpoints you want before connecting.</p>
-
-  <p>Changing either the application being debugged or the "Wait for debugger" option causes the
-  system to kill the selected application if it is currently running. You can use this to kill your
-  application if it is in a bad state by simply going to the settings and toggling the
-  checkbox.</p>
-
-
-
-
-
-
-
diff --git a/docs/html/tools/help/index.jd b/docs/html/tools/help/index.jd
index e7b911119197..411f908463ba 100755
--- a/docs/html/tools/help/index.jd
+++ b/docs/html/tools/help/index.jd
@@ -43,10 +43,6 @@ avd</code>) the emulator (<code>emulator</code>), and the Dalvik Debug Monitor S
   <dt><a href="{@docRoot}tools/help/android.html">android</a></dt>
     <dd>Lets you manage AVDs, projects, and the installed components of the SDK.</dd>
 
-  <dt><a href="{@docRoot}tools/help/app-link-indexing.html">Deep Link and App Indexing API Support</a></dt>
-    <dd>Helps you add deep links, app indexing, and search functionality to your apps.
-  These features can make it easier to find content in an installed app, drive more traffic to your
-  app, discover which app content is used most, and attract new users.</dd>
 
   <dt><a href="{@docRoot}tools/help/hierarchy-viewer.html">Hierarchy Viewer (hierarchyviewer)</a></dt>
     <dd>Provides a visual representation of the layout's View hierarchy with performance information
@@ -63,8 +59,6 @@ avd</code>) the emulator (<code>emulator</code>), and the Dalvik Debug Monitor S
   <dt><a href="{@docRoot}tools/help/sqlite3.html">sqlite3</a></dt>
     <dd>Lets you access the SQLite data files created and used by Android applications.</dd>
 
-  <dt><a href="{@docRoot}tools/help/translations-editor.html">Translations Editor</a></dt>
-    <dd>Lets you view and update all your string resource translations in one convenient place.</dd>
 
 </dl>
 
@@ -85,9 +79,8 @@ avd</code>) the emulator (<code>emulator</code>), and the Dalvik Debug Monitor S
   <dt><a href="{@docRoot}tools/help/shell.html">ADB Shell Commands</a></dt>
     <dd>Learn the commands available for advanced command-line operations.</dd>
 
-  <dt><a href="{@docRoot}tools/debugging/ddms.html">Dalvik Debug Monitor
-Server (ddms)</a></dt>
-    <dd>Lets you debug Android applications.</dd>
+  <dt><a href="{@docRoot}tools/debugging/ddms.html">Dalvik Debug Monitor Server (ddms)</a></dt>
+    <dd>Lets you debug Android apps.</dd>
 
   <dt><a href="{@docRoot}tools/help/monitor.html">Device Monitor</a></dt>
     <dd>Android Device Monitor is a stand-alone tool that provides a graphical user interface for
@@ -112,6 +105,11 @@ you can view the file in a profiling tool of your choice.</dd>
   <dt><a href="{@docRoot}tools/help/traceview.html">traceview</a></dt>
     <dd>Provides a graphical viewer for execution logs saved by your application.</dd>
 
+  <dt><a href="{@docRoot}tools/help/gltracer.html">Tracer for OpenGL ES</a></dt>
+    <dd>Allows you to capture <a href="{@docRoot}guide/topics/graphics/opengl.html">OpenGL ES</a>
+      commands and frame-by-frame images to help you understand how your app is executing
+      graphics commands.</dd>
+
 </dl>
 
 
@@ -142,24 +140,10 @@ files after they have been signed.</dd>
 WYSIWYG editor. It also previews stretched versions of the image, and highlights the area in which
 content is allowed.</dd>
 
-<dt><a href="{@docRoot}tools/help/image-asset-studio.html">Image Asset Studio</a></dt>
-    <dd>Helps you to generate custom icons for your Android applications from existing images, cliparts, or text.
-     It generates a set of icons at the appropriate resolution for each generalized screen density that your app
-     supports.</dd>
-
-<dt><a href="{@docRoot}tools/help/vector-asset-studio.html">Vector Asset Studio</a></dt>
-
-    <dd>Helps you add material icons and import Scalable Vector Graphic (SVG) files into your
-    Android Studio project as a drawable resource.</dd>
-
   <dt><a href="{@docRoot}tools/help/etc1tool.html">etc1tool</a></dt>
     <dd>A command line utility that lets you encode PNG images to the ETC1 compression standard and
     decode ETC1 compressed images back to PNG.</dd>
 
-  <dt><a href="{@docRoot}tools/help/gltracer.html">Tracer for OpenGL ES</a></dt>
-    <dd>Allows you to capture OpenGL ES commands and frame by frame images to help you understand
-    how your graphics commands are being executed.</dd>
-
 </dl>
 
 
diff --git a/docs/html/tools/studio/code-tools.jd b/docs/html/tools/studio/code-tools.jd
new file mode 100644
index 000000000000..4033bfcb28d8
--- /dev/null
+++ b/docs/html/tools/studio/code-tools.jd
@@ -0,0 +1,28 @@
+page.title=Android Studio Code Tools
+
+@jd:body
+
+<p>
+  Android Studio provides a number of coding features to assist with writing and building your
+  app. These tools help you write code faster and improve quality.
+</p>
+
+<dl>
+  <dt><a href="{@docRoot}tools/debugging/improving-w-lint.html">Lint</a></dt>
+    <dd>The Lint tool is a static code analysis tool that checks your Android
+    project source files for potential bugs and optimization improvements.</dd>
+
+  <dt><a href="{@docRoot}tools/debugging/annotations.html">Code Annotations</a></dt>
+    <dd>Annotations help you improve code readability and improve code inspector output,
+      by allowing you to more clearly define method parameter requirements.
+    </dd>
+
+  <dt><a href="{@docRoot}tools/help/app-link-indexing.html">Deep Link and App Indexing</a></dt>
+    <dd>These features help you add deep links, app indexing, and search functionality to your
+      apps. These features can make it easier to find content in an installed app, drive more
+      traffic to your app, discover which app content users view the most, and attract new users.
+    </dd>
+
+</dl>
+
+
diff --git a/docs/html/tools/studio/index.jd b/docs/html/tools/studio/index.jd
index 1c0fe996044f..5c05363ef229 100644
--- a/docs/html/tools/studio/index.jd
+++ b/docs/html/tools/studio/index.jd
@@ -43,7 +43,6 @@ Android Studio offers:</p>
   <li>And much more</li>
 </ul>
 
-
 <p>If you're new to Android Studio or the IntelliJ IDEA interface, this
 page provides an introduction to some key Android
 Studio features.</p>
@@ -235,19 +234,9 @@ calls related to those actions to optimize your app's performance and memory use
 <img src="{@docRoot}images/tools/studio-allocation-tracker.png" alt="" />
     <p class="img-caption"><strong>Figure 6.</strong> Allocation tracker.</p>
 
-<p>Perform the following steps to track and analyze allocations: </p>
-<ol>
-  <li>Click the Start/Stop Allocation Tracking icon
-    (<img src="{@docRoot}images/tools/studio-allocation-tracker-icon.png" style="vertical-align:bottom;margin:0;height:17px"/>) in the
-    <a href="#mem-cpu">Memory Monitor</a>. Android Studio starts tracking memory allocations.</li>
-  <li>Perform the tasks whose mallocs you want to track. </li> 
-  <li>Click the Start/Stop Allocation Tracking icon again. Android Studio stops tracking mallocs
-    and saves the data to a file named <code>Allocation-yyyy.mm.dd-hh.mm.ss.alloc</code>. The
-    resulting file appears in the <em>Captures</em> tab. </li>
-  <li>Double-click the file to open it in the allocation viewer.
-   <p>The allocation viewer allows you to view and analyze the allocations your app made while
-   running. </p> </li>
-</ol>
+<p>For information about tracking and analyzing allocations, see
+  <a href="{@docRoot}/tools/help/am-memory.html#tracking">Memory Monitor</a>.
+</p>
 
 
 <h3>Data file access</h3>
@@ -359,7 +348,7 @@ Studio. Android Studio validates the configured annotations during code inspecti
  <strong>Library dependency</strong>.</li>
  <li>In the <em>Choose Library Dependency</em> dialog, select <code>support-annotations</code> and
  click <strong>Ok</strong>. </li>
-</ol> 
+</ol>
 
 <p>The <code>build.gradle</code> file is updated with the <code>support-annotations</code>
 dependency.</p>
diff --git a/docs/html/tools/studio/ui-tools.jd b/docs/html/tools/studio/ui-tools.jd
new file mode 100644
index 000000000000..2d25de66c374
--- /dev/null
+++ b/docs/html/tools/studio/ui-tools.jd
@@ -0,0 +1,32 @@
+page.title=Android Studio User Interface Tools
+
+@jd:body
+
+<p>
+  Android Studio provides a number of user interface tools to assist you with creating layouts,
+  implementing style themes, and building graphic or text resources for your app.
+</p>
+
+<dl>
+
+   <dt><a href="{@docRoot}sdk/installing/studio-layout.html">Layout Editor</a></dt>
+        <dd>Drag and drop user interface elements to build layouts for your app.
+        </dd>
+
+   <dt><a href="{@docRoot}tools/help/theme-editor.html">Theme Editor</a></dt>
+        <dd>Build re-usable user interface styles for layouts and widgets in your app.
+        </dd>
+
+    <dt><a href="{@docRoot}tools/help/translations-editor.html">Translations Editor</a></dt>
+        <dd>View and update all your string resource translations in one convenient place.
+        </dd>
+
+    <dt><a href="{@docRoot}tools/help/vector-asset-studio.html">Vector Asset Studio</a></dt>
+        <dd>Add material icons and import Scalable Vector Graphic (SVG) files into your
+        Android Studio project as a drawable resource.</dd>
+
+    <dt><a href="{@docRoot}tools/help/image-asset-studio.html">Image Asset Studio</a></dt>
+      <dd>Generate custom icons for your Android applications from existing images,
+        clipart, or text.</dd>
+
+</dl>
diff --git a/docs/html/tools/tools_toc.cs b/docs/html/tools/tools_toc.cs
index 14af176a470a..9f575d41ed6f 100644
--- a/docs/html/tools/tools_toc.cs
+++ b/docs/html/tools/tools_toc.cs
@@ -13,33 +13,6 @@
   </li>
 
 
-<!-- Android Studio menu-->
-
- <li class="nav-section">
-    <div class="nav-section-header">
-      <a href="<?cs var:toroot?>tools/studio/index.html"><span class="en">Android Studio</span></a>
-    </div>
-    <ul>
-      <li><a href="<?cs var:toroot ?>tools/studio/studio-config.html">
-          Configuration</a></li>
-      <li><a href="<?cs var:toroot ?>tools/studio/studio-features.html">
-          Features</a></li>
-      <li><a href="<?cs var:toroot ?>sdk/installing/studio-tips.html">
-          Tips and Tricks</a></li>
-      <li class="nav-section">
-        <div class="nav-section-header"><a href="<?cs var:toroot ?>sdk/installing/migrate.html">
-        <span class="en">
-          Migrating from Eclipse ADT</span></a></div>
-          <ul>
-            <li><a href="<?cs var:toroot ?>tools/studio/eclipse-transition-guide.html">
-            <span class="en">Transition Guide</span></a></li>
-          </ul>
-      </li>
-    </ul>
-
- </li><!-- End of Android Studio menu -->
-
-
 <!-- Workflow menu-->
 
   <li class="nav-section">
@@ -47,82 +20,120 @@
         <a href="<?cs var:toroot ?>tools/workflow/index.html"><span class="en">Workflow</span></a>
     </div>
     <ul>
-      <li class="nav-section">
-        <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/devices/index.html">
-        <span class="en">
-        Setting Up Virtual Devices</span></a></div>
-        <ul>
-          <li><a href="<?cs var:toroot ?>tools/devices/managing-avds.html"><span class="en">With AVD Manager</span></a></li>
-          <li><a href="<?cs var:toroot ?>tools/devices/managing-avds-cmdline.html"><span class="en">From the Command Line</span></a></li>
-          <li><a href="<?cs var:toroot ?>tools/devices/emulator.html"><span class="en">Using the Emulator</span></a></li>
-        </ul>
+      <li><a href="<?cs var:toroot ?>tools/projects/index.html">
+          <span class="en">Projects</span></a>
       </li>
-      <li class="nav-section">
-        <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/device.html"><span class="en">Using Hardware Devices</span></a></div>
-        <ul>
-          <li><a href="<?cs var:toroot ?>tools/extras/oem-usb.html"><span
-            class="en">USB Drivers</span></a></li>
-        </ul>
+      <li><a href="<?cs var:toroot ?>tools/building/index.html">
+          <span class="en">Build and Run</span></a>
       </li>
+      <li><a href="<?cs var:toroot ?>tools/devices/index.html">
+        <span class="en">Virtual Devices</span></a></li>
+
       <li class="nav-section">
-        <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/projects/index.html"><span class="en">Managing Projects</span></a></div>
+        <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/device.html">
+          <span class="en">Hardware Devices</span></a></div>
         <ul>
-          <li><a href="<?cs var:toroot ?>sdk/installing/create-project.html"><span class="en">From Android Studio</span></a></li>
-          <li><a href="<?cs var:toroot ?>tools/projects/projects-cmdline.html"><span class="en">From the Command Line</span></a></li>
-          <li><a href="<?cs var:toroot ?>tools/projects/templates.html"><span class="en">Using Code Templates</span></a></li>
+          <li><a href="<?cs var:toroot ?>tools/extras/oem-usb.html">
+            <span class="en">USB Drivers</span></a></li>
         </ul>
       </li>
 
-
-      <li class="nav-section">
-        <div class="nav-section-header">
-          <a href="<?cs var:toroot ?>tools/building/index.html">
-          <span class="en">Building and Running</span></a>
-        </div>
-        <ul>
-          <li><a href="<?cs var:toroot ?>tools/building/building-studio.html">
-            <span class="en">From Android Studio</span></a></li>
-          <li><a href="<?cs var:toroot ?>tools/building/building-cmdline.html">
-            <span class="en">From the Command-Line</span></a></li>
-        </ul>
+      <li><a href="<?cs var:toroot?>tools/testing/index.html">
+        <span class="en">Testing</span></a>
       </li>
 
-  <li><a href="<?cs var:toroot?>tools/testing/index.html"><span class="en">Testing</span></a></li>
+      <li><a href="<?cs var:toroot ?>tools/debugging/index.html">
+          <span class="en">Debugging</span></a></li>
 
-  <li class="nav-section">
-    <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/debugging/index.html"><span class="en">Debugging</span></a></div>
-    <ul>
-      <li><a href="<?cs var:toroot ?>tools/debugging/debugging-studio.html"><span class="en">From Android Studio</span></a></li>
-      <li><a href="<?cs var:toroot ?>tools/debugging/debugging-projects-cmdline.html"><span class="en">From Other IDEs</span></a></li>
-      <li><a href="<?cs var:toroot ?>tools/debugging/ddms.html"><span class="en">Using DDMS</span></a></li>
-      <li><a href="<?cs var:toroot ?>tools/debugging/debugging-log.html"><span class="en">Reading and Writing Logs</span></a></li>
-      <li><a href="<?cs var:toroot ?>tools/debugging/improving-w-lint.html"><span class="en">Improving Your Code with lint</span></a></li>
-      <li><a href="<?cs var:toroot ?>tools/debugging/debugging-ui.html"><span class="en">Optimizing your UI</span></a></li>
-      <li><a href="<?cs var:toroot ?>tools/debugging/debugging-tracing.html"><span class="en">Profiling with Traceview and dmtracedump</span></a></li>
-      <li><a href="<?cs var:toroot ?>tools/debugging/annotations.html"><span class="en">Improving Code Inspection with Annotations</span></a></li>
-      <li><a href="<?cs var:toroot ?>tools/debugging/systrace.html"><span class="en">Analyzing UI Performance</span></a></li>
-      <li><a href="<?cs var:toroot ?>tools/debugging/debugging-memory.html">Investigating Your RAM Usage</a></li>
-      <li><a href="<?cs var:toroot ?>tools/debugging/debugging-devtools.html"><span class="en">Using the Dev Tools App</span></a></li>
-    </ul>
-  </li>
       <li class="nav-section">
-        <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/publishing/publishing_overview.html" zh-cn-lang="发布概述"><span class="en">Publishing</span></a></div>
+        <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/publishing/publishing_overview.html"
+          zh-cn-lang="发布概述"><span class="en">Publishing</span></a></div>
         <ul>
           <li><a href="<?cs var:toroot ?>tools/publishing/preparing.html" zh-cn-lang="准备发布"><span class="en">Preparing for Release</span></a></li>
           <li><a href="<?cs var:toroot ?>tools/publishing/versioning.html"><span class="en">Versioning Your Apps</span></a></li>
           <li><a href="<?cs var:toroot ?>tools/publishing/app-signing.html"><span class="en">Signing Your Apps</span></a></li>
         </ul>
       </li>
+
     </ul>
-  </li>
+  </li> <!-- end of Workflow -->
 
 
-  <li class="nav-section">
-    <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/help/index.html"><span
-class="en">Tools Help</span></a></div>
+<!-- Android Studio menu-->
+
+ <li class="nav-section">
+    <div class="nav-section-header">
+      <a href="<?cs var:toroot?>tools/studio/index.html"><span class="en">Android Studio</span></a>
+    </div>
     <ul>
-      <li><a href="<?cs var:toroot ?>tools/help/adb.html">adb</a></li>
-      <li><a href="<?cs var:toroot ?>tools/help/android.html">android</a></li>
+      <li><a href="<?cs var:toroot ?>tools/studio/studio-features.html">
+          Features</a></li>
+
+      <li class="nav-section">
+        <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/studio/studio-config.html">
+          Configuration</a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>tools/help/sdk-manager.html">SDK Manager</a></li>
+          </ul>
+      </li>
+
+      <li class="nav-section">
+        <div class="nav-section-header">
+          <a href="<?cs var:toroot ?>sdk/installing/create-project.html">
+          Project Tools</a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>tools/help/project-mgmt.html">
+              <span class="en">Project Structure Management</span></a></li>
+            <li><a href="<?cs var:toroot ?>tools/projects/templates.html">
+              <span class="en">Using Code Templates</span></a></li>
+            <li><a href="<?cs var:toroot ?>tools/building/building-studio.html">
+              <span class="en">Building and Running</span></a></li>
+          </ul>
+      </li>
+
+      <li class="nav-section">
+        <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/studio/code-tools.html">
+          Code Tools</a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>tools/debugging/improving-w-lint.html">
+              <span class="en">Improving Your Code with lint</span></a></li>
+            <li><a href="<?cs var:toroot ?>tools/debugging/annotations.html">
+              <span class="en">Improving Code Inspection with Annotations</span></a></li>
+            <li><a href="<?cs var:toroot ?>tools/help/app-link-indexing.html">
+              <span class="en">Deep Link and App Indexing API Support</span></a></li>
+          </ul>
+      </li>
+
+      <li class="nav-section">
+        <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/studio/ui-tools.html">
+          UI Tools</a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>sdk/installing/studio-layout.html">
+              <span class="en">Layout Editor</span></a></li>
+            <li><a href="<?cs var:toroot ?>tools/help/theme-editor.html">
+              <span class="en">Theme Editor</span></a></li>
+            <li><a href="<?cs var:toroot ?>tools/help/translations-editor.html">
+              <span class="en">Translations Editor</span></a>
+            <li><a href="<?cs var:toroot ?>tools/help/vector-asset-studio.html">
+              <span class="en">Vector Asset Studio</span></a></li>
+            <li><a href="<?cs var:toroot ?>tools/help/image-asset-studio.html">
+              <span class="en">Image Asset Studio</span></a></li>
+          </ul>
+      </li>
+
+      <li><a href="<?cs var:toroot ?>tools/devices/managing-avds.html">
+        <span class="en">AVD Manager</span></a></li>
+
+      <li class="nav-section">
+        <div class="nav-section-header">
+          <a href="<?cs var:toroot ?>tools/debugging/debugging-studio.html">
+            <span class="en">Debugging Tools</span></a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>tools/debugging/ddms.html">
+              <span class="en">DDMS</span></a></li>
+          </ul>
+      </li>
+
       <li class="nav-section">
         <div class="nav-section-header">
           <a href="<?cs var:toroot ?>tools/help/android-monitor.html">Android Monitor</a></div>
@@ -144,34 +155,81 @@ class="en">Tools Help</span></a></div>
           </li>
         </ul>
       </li>
+
+      <li><a href="<?cs var:toroot ?>sdk/installing/studio-tips.html">
+          Tips and Tricks</a></li>
+
+      <li class="nav-section">
+        <div class="nav-section-header"><a href="<?cs var:toroot ?>sdk/installing/migrate.html">
+        <span class="en">
+          Migrating from Eclipse ADT</span></a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>tools/studio/eclipse-transition-guide.html">
+            <span class="en">Transition Guide</span></a></li>
+          </ul>
+      </li>
+    </ul>
+
+ </li><!-- End of Android Studio menu -->
+
+
+  <li class="nav-section">
+    <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/help/index.html"><span
+class="en">Tools Help</span></a></div>
+    <ul>
+      <li><a href="<?cs var:toroot ?>tools/help/adb.html">adb</a></li>
+      <li class="nav-section">
+        <div class="nav-section-header">
+          <a href="<?cs var:toroot ?>tools/help/android.html">android</a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>tools/devices/managing-avds-cmdline.html"><span class="en">
+              Managing AVDs</span></a></li>
+            <li><a href="<?cs var:toroot ?>tools/projects/projects-cmdline.html"><span class="en">
+              Managing Projects</span></a></li>
+          </ul>
+      </li>
       <li><a href="<?cs var:toroot ?>tools/help/avd-manager.html">AVD Manager</a></li>
       <li><a href="<?cs var:toroot ?>tools/help/bmgr.html">bmgr</a>
-      <li><a href="<?cs var:toroot ?>tools/help/app-link-indexing.html">Deep Link and App Indexing API Support</a></li>
       <li><a href="<?cs var:toroot ?>tools/help/desktop-head-unit.html">Desktop Head Unit</a></li>
       <li><a href="<?cs var:toroot ?>tools/help/monitor.html">Device Monitor</a></li>
       <li><a href="<?cs var:toroot ?>tools/help/dmtracedump.html">dmtracedump</a></li>
       <li><a href="<?cs var:toroot ?>tools/help/draw9patch.html">Draw 9-Patch</a></li>
-      <li><a href="<?cs var:toroot ?>tools/help/emulator.html">Emulator</a></li>
+
       <li><a href="<?cs var:toroot ?>tools/help/etc1tool.html">etc1tool</a></li>
-      <li><a href="<?cs var:toroot ?>tools/help/hierarchy-viewer.html">Hierarchy Viewer</a></li>
+
+      <li class="nav-section">
+        <div class="nav-section-header">
+          <a href="<?cs var:toroot ?>tools/help/hierarchy-viewer.html">
+            <span class="en">Hierarchy Viewer</span></a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>tools/debugging/debugging-ui.html">
+              <span class="en">Optimizing your UI</span></a></li>
+          </ul>
+      </li>
+
       <li><a href="<?cs var:toroot ?>tools/help/hprof-conv.html">hprof-conv</a></li>
       <li><a href="<?cs var:toroot ?>tools/help/jobb.html">jobb</a></li>
-      <li><a href="<?cs var:toroot ?>sdk/installing/studio-layout.html">Layout Editor</span></a></li>
       <li><a href="<?cs var:toroot ?>tools/help/lint.html">lint</span></a></li>
-      <li><a href="<?cs var:toroot ?>tools/help/logcat.html">logcat</a></li>
+      <li class="nav-section">
+        <div class="nav-section-header">
+          <a href="<?cs var:toroot ?>tools/help/logcat.html">logcat</a></div>
+          <ul>
+            <li><a href="<?cs var:toroot ?>tools/debugging/debugging-log.html">
+              <span class="en">Reading and Writing Logs</span></a></li>
+          </ul>
+      </li>
       <li><a href="<?cs var:toroot ?>tools/help/mksdcard.html">mksdcard</a></li>
        <li><a href="<?cs var:toroot ?>tools/help/proguard.html" zh-cn-lang="ProGuard">ProGuard</a></li>
-       <li><a href="<?cs var:toroot ?>tools/help/project-mgmt.html">Project Structure Management</a></li>
-       <li><a href="<?cs var:toroot ?>tools/help/sdk-manager.html">SDK Manager</a></li>
-       <li><a href="<?cs var:toroot ?>tools/help/systrace.html">Systrace</a></li>
-       <li><a href="<?cs var:toroot ?>tools/help/theme-editor.html">Theme Editor</a></li>
        <li><a href="<?cs var:toroot ?>tools/help/gltracer.html">Tracer for OpenGL ES</a></li>
-       <li>
-           <a href="<?cs var:toroot ?>tools/help/translations-editor.html">Translations Editor</a>
+
+       <li class="nav-section">
+        <div class="nav-section-header">
+          <a href="<?cs var:toroot ?>tools/devices/emulator.html">
+            <span class="en">Virtual Device Emulator</span></a></div>
+         <ul>
+           <li><a href="<?cs var:toroot ?>tools/help/emulator.html">Command Reference</a></li>
+         </ul>
        </li>
-       <li><a href="<?cs var:toroot ?>tools/help/traceview.html">Traceview</a></li>
-       <li><a href="<?cs var:toroot ?>tools/help/vector-asset-studio.html">Vector Asset Studio</a></li>
-       <li><a href="<?cs var:toroot ?>tools/help/image-asset-studio.html">Image Asset Studio</a></li>
        <li><a href="<?cs var:toroot ?>tools/help/zipalign.html">zipalign</a></li>
 
     </ul>
@@ -187,6 +245,8 @@ class="en">Tools Help</span></a></div>
       <a href="<?cs var:toroot ?>sdk/installing/studio-build.html">Build System</a>
     </div>
     <ul>
+      <li><a href="<?cs var:toroot ?>tools/building/building-cmdline.html">
+        <span class="en">Running Gradle Builds</span></a></li>
       <li><a href="<?cs var:toroot ?>tools/building/configuring-gradle.html">
         <span class="en">Configuring Gradle Builds</span></a></li>
       <li><a href="<?cs var:toroot ?>tools/building/plugin-for-gradle.html">
@@ -238,14 +298,38 @@ class="en">Tools Help</span></a></div>
           <li><a href="<?cs var:toroot ?>tools/performance/allocation-tracker/index.html"><span
             class="en">Allocation Tracker</span></a>
           </li>
+          <li><a href="<?cs var:toroot ?>tools/debugging/debugging-memory.html">
+            <span class="en">Investigating Your RAM Usage</span></a></li>
         </ul>
       </li>
-      <li><a href="<?cs var:toroot ?>tools/performance/traceview/index.html">
-        Traceview</a>
+
+      <li class="nav-section">
+        <div class="nav-section-header">
+          <a href="<?cs var:toroot ?>tools/debugging/debugging-tracing.html">
+            <span class="en">Traceview</span></a>
+        </div>
+        <ul>
+          <li><a href="<?cs var:toroot ?>tools/performance/traceview/index.html">
+            Walkthrough</a>
+          </li>
+          <li><a href="<?cs var:toroot ?>tools/help/traceview.html">
+            Command Reference</a></li>
+        </ul>
       </li>
-      <li><a href="<?cs var:toroot ?>tools/performance/systrace/index.html">
-        Systrace</a>
+
+      <li class="nav-section">
+        <div class="nav-section-header">
+          <a href="<?cs var:toroot ?>tools/debugging/systrace.html">
+          <span class="en">Systrace</span></a>
+        </div>
+        <ul>
+          <li><a href="<?cs var:toroot ?>tools/performance/systrace/index.html">
+            Walkthrough</a></li>
+           <li><a href="<?cs var:toroot ?>tools/help/systrace.html">
+            Command Reference</a></li>
+        </ul>
       </li>
+
       <li class="nav-section">
         <div class="nav-section-header">
           <a href="<?cs var:toroot ?>tools/performance/batterystats-battery-historian/index.html">
@@ -263,8 +347,9 @@ class="en">Tools Help</span></a></div>
   <!-- Testing Tools menu-->
 
   <li class="nav-section">
-    <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/testing/testing-tools.html">
-    <span class="en">Testing Tools</span></a></div>
+    <div class="nav-section-header">
+      <a href="<?cs var:toroot ?>tools/testing/testing-tools.html">
+      <span class="en">Testing Tools</span></a></div>
     <ul>
       <li><a href="<?cs var:toroot ?>tools/testing/testing_android.html">Testing Concepts</a></li>
       <li class="nav-section">