Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2b7aec46 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am f002b675: Merge "docs: shorten and revise some titles in the Developing... 

am f002b675: Merge "docs: shorten and revise some titles in the Developing docs and resolve respective links" into honeycomb

* commit 'f002b675':
  docs: shorten and revise some titles in the Developing docs and resolve respective links
parents 9087566b f002b675

docs/html/guide/developing/building/building-cmdline.jd

+3 −4
Original line number Diff line number Diff line 
page.title=Building and Running Apps on the Command Line

page.title=Building and Running from the Command Line

@jd:body



 <div id="qv-wrapper">
@@ -46,10 +46,9 @@ page.title=Building and Running Apps on the Command Line 
  <p class="note"><strong>Note:</strong> When installing JDK on Windows, the default is to install

  in the "Program Files" directory. This location will cause <code>ant</code> to fail, because of

  the space. To fix the problem, you can specify the JAVA_HOME variable like this: 

  <pre>set JAVA_HOME=c:\Progra~1\Java\&lt;jdkdir&gt;

  </pre>

  <pre>set JAVA_HOME=c:\Progra~1\Java\&lt;jdkdir&gt;</pre>

  

  The easiest solution, however, is to install JDK in a non-space directory, for example:

  <p>The easiest solution, however, is to install JDK in a non-space directory, for example:</p>

  

  <pre>c:\java\jdk1.6.0_02</pre>

docs/html/guide/developing/building/building-eclipse.jd

+2 −2
Original line number Diff line number Diff line 
page.title=Building and Running Apps in Eclipse

page.title=Building and Running from Eclipse

@jd:body



<div id="qv-wrapper">
@@ -88,7 +88,7 @@ page.title=Building and Running Apps in Eclipse 
    <li>Ensure that your development computer can detect your device when connected via USB</li>

  </ul>



  <p>Read <a href="{@docRoot}guide/developing/device.html">Connecting Hardware Devices</a>

  <p>Read <a href="{@docRoot}guide/developing/device.html">Using Hardware Devices</a>

  for more information.</p>



  <p>Once set up and your device is connected via USB, install your application on the device by

docs/html/guide/developing/building/index.jd

+2 −2
Original line number Diff line number Diff line 
page.title=Building and Running Apps

page.title=Building and Running

@jd:body



<div id="qv-wrapper">
@@ -49,7 +49,7 @@ page.title=Building and Running Apps 
  tools and processes are masked from you. The following diagram depicts the different tools and

  processes that are involved in a build:</p>



  <p><img src="{@docRoot}images/build.png" /></p>

  <img src="{@docRoot}images/build.png" />



  <p>The general process for a typical build is outlined below:</p>

docs/html/guide/developing/debugging/debugging-devtools.jd

+3 −2
Original line number Diff line number Diff line
@@ -59,8 +59,9 @@ adb -d install Development.apk 
    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 application's state, see 

    <a href="{@docRoot}guide/topics/resources/runtime-changes.html">Handling Runtime Changes</a>.</dd>

    due to not saving state. For more information about saving an activity's state, see the

    <a href="{@docRoot}guide/topics/fundamentals/activities.html#SavingActivityState">Activities</a>

document.</dd>



    <dt><strong>Show CPU usage</strong></dt>

docs/html/guide/developing/debugging/debugging-log.jd

+1 −1
Original line number Diff line number Diff line 
page.title=Reading and Writing Log Messages

page.title=Reading and Writing Logs

@jd:body



<div id="qv-wrapper">