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

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

am c7d25978: am f94e1296: am 67747a68: Merge "update info about usb debugging... 

am c7d25978: am f94e1296: am 67747a68: Merge "update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666" into jb-mr1-dev

* commit 'c7d25978':
  update info about usb debugging for mr1 changes bug: 7333465 bug: 7318666
parents 79335b43 c7d25978

docs/html/tools/building/building-cmdline.jd

+12 −2
Original line number Diff line number Diff line
@@ -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>

docs/html/tools/building/building-eclipse.jd

+12 −2
Original line number Diff line number Diff line
@@ -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>

docs/html/tools/device.jd

+11 −5
Original line number Diff line number Diff line
@@ -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>

docs/html/training/basics/firstapp/running-app.jd

+16 −7
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ Android project, it includes a default set of "Hello World" source files that al 
immediately run the app.</p>



<p>How you run your app depends on two things: whether you have a real Android-powered device and

whether you’re using Eclipse. This lesson shows you how to install and run your app on a

whether you're using Eclipse. This lesson shows you how to install and run your app on a

real device and on the Android emulator, and in both cases with either Eclipse or the command line

tools.</p>
@@ -85,12 +85,21 @@ important that you understand how to run your app before you start developing.</ 


<ol>

  <li>Plug in your device to your development machine with a USB cable.

If you’re developing on Windows, you might need to install the appropriate USB driver for your

If you're developing on Windows, you might need to install the appropriate USB driver for your

device. For help installing drivers, see the <a href="{@docRoot}tools/extras/oem-usb.html">OEM USB

Drivers</a> document.</li>  

  <li>Ensure that <strong>USB debugging</strong> is enabled in the device Settings (open Settings

and navitage to <strong>Applications > Development</strong> on most devices, or click

<strong>Developer options</strong> on Android 4.0 and higher).</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>

</ol>



<p>To run the app from Eclipse, open one of your project's files and click
@@ -118,7 +127,7 @@ lesson</a>.</p> 


<h2 id="Emulator">Run on the Emulator</h2>



<p>Whether you’re using Eclipse or the command line, to run your app on the emulator you need to

<p>Whether you're using Eclipse or the command line, to run your app on the emulator you need to

first create an <a href="{@docRoot}tools/devices/index.html">Android Virtual Device</a> (AVD). An

AVD is a device configuration for the Android emulator that allows you to model different

devices.</p>