Merge "docs: update device doc with missing changes from hc mr2"
diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd
index 5443529d..cfb9a36 100644
--- a/docs/html/guide/developing/device.jd
+++ b/docs/html/guide/developing/device.jd
@@ -41,7 +41,8 @@
<p class="note"><strong>Note:</strong> When developing on a device, keep in mind that you should
still use the <a
-href="{@docRoot}guide/developing/devices/emulator.html">Android emulator</a> to test your application
+href="{@docRoot}guide/developing/devices/emulator.html">Android emulator</a> to test your
+application
on configurations that are not equivalent to those of your real device. Although the emulator
does not allow you to test every device feature (such as the accelerometer), it does
allow you to verify that your application functions properly on different versions of the Android
@@ -56,14 +57,22 @@
<ol>
<li>Declare your application as "debuggable" in your Android Manifest.
<p>In Eclipse, you can do this from the <b>Application</b> tab when viewing the Manifest
- (on the right side, set <b>Debuggable</b> to <em>true</em>). Otherwise, in the <code>AndroidManifest.xml</code>
- file, add <code>android:debuggable="true"</code> to the <code><application></code> element.</p>
+ (on the right side, set <b>Debuggable</b> to <em>true</em>). Otherwise, in the
+<code>AndroidManifest.xml</code>
+ file, add <code>android:debuggable="true"</code> to the <code><application></code>
+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
+
+<strong>Unknown sources</strong>.</p>
+
</li>
<li>Turn on "USB Debugging" on your device.
- <p>On the device, go to the home screen, press <b>MENU</b>, select <b>Applications</b> > <b>Development</b>,
- then enable <b>USB debugging</b>.</p>
+ <p>On the device, go to <strong>Settings > Applications > Development</strong>
+ and enable <strong>USB debugging</strong>.</p>
</li>
- <li>Setup your system to detect your device.
+ <li>Set up your system to detect your device.
<ul>
<li>If you're developing on Windows, you need to install a USB driver
for adb. If you're using an Android Developer Phone (ADP), Nexus One, or Nexus S,
@@ -71,27 +80,38 @@
Driver</a>. Otherwise, you can find a link to the appropriate OEM driver in the
<a href="{@docRoot}sdk/oem-usb.html">OEM USB Drivers</a> document.</li>
<li>If you're developing on Mac OS X, it just works. Skip this step.</li>
- <li>If you're developing on Ubuntu Linux, you need to add a rules file
-that contains a USB configuration for each type of device you want to use for
-development. Each device manufacturer uses a different vendor ID. The
-example rules files below show how to add an entry for a single vendor ID
-(the HTC vendor ID). In order to support more devices, you will need additional
-lines of the same format that provide a different value for the
-<code>SYSFS{idVendor}</code> property. For other IDs, see the table of <a
-href="#VendorIds">USB Vendor IDs</a>, below.
- <ol>
- <li>Log in as root and create this file:
- <code>/etc/udev/rules.d/51-android.rules</code>.
- <p>For Gusty/Hardy, edit the file to read:<br/>
- <code>SUBSYSTEM=="usb", SYSFS{idVendor}=="0bb4",
- MODE="0666"</code></p>
+
+ <li>If you're developing on Ubuntu Linux, you need to add a <a
+href="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html">
+<code>udev</code></a>
+rules file that contains a USB configuration for each type of device
+you want to use for development. In the rules file, each device manufacturer
+is identified by a unique vendor ID, as specified by the
+<code>ATTR{idVendor}</code> property. For a list of vendor IDs, see <a
+href="#VendorIds">USB Vendor IDs</a>, below. To set up device detection on
+Ubuntu Linux:
- <p>For Dapper, edit the file to read:<br/>
- <code>SUBSYSTEM=="usb_device", SYSFS{idVendor}=="0bb4",
- MODE="0666"</code></p>
+ <ol type="a">
+ <li>Log in as root and create this file:
+ <code>/etc/udev/rules.d/51-android.rules</code></span>.
+ <p>Use this format to add each vendor to the file:<br/>
+ <code>SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4",
+MODE="0666", GROUP="plugdev"</code>
+ <br /><br />
+
+ In this example, the vendor ID is for HTC. The <code>MODE</code>
+assignment specifies read/write permissions, and <code>GROUP</code> defines
+which Unix group owns the device node. </p>
+
+ <p class="note"><strong>Note:</strong> The rule syntax
+may vary slightly depending on your environment. Consult the <code>udev</code>
+documentation for your system as needed. For an overview of rule syntax, see
+this guide to <a
+href="http://www.reactivated.net/writing_udev_rules.html">writing udev
+rules</a>.</p>
</li>
<li>Now execute:<br/>
- <code>chmod a+r /etc/udev/rules.d/51-android.rules</code>
+ <code>chmod a+r /etc/udev/rules.d/51-android.rules</code>
</li>
</ol>
</li>
@@ -99,82 +119,146 @@
</li>
</ol>
-<p>You can verify that your device is connected by executing <code>adb devices</code> from your
-SDK {@code platform-tools/} directory. If connected, you'll see the device name listed as a
-"device."</p>
+<p>You can verify that your device is connected by executing <code>adb
+devices</code> from your SDK {@code platform-tools/} directory. If connected,
+you'll see the device name listed as a "device."</p>
-<p>If using Eclipse, run or debug as usual. You will be presented
-with a <b>Device Chooser</b> dialog that lists the available emulator(s) and connected device(s).
-Select the device upon which you want to install and run the application.</p>
+<p>If using Eclipse, run or debug your application as usual. You will be
+presented with a <b>Device Chooser</b> dialog that lists the available
+emulator(s) and connected device(s). Select the device upon which you want to
+install and run the application.</p>
-<p>If using the <a href="{@docRoot}guide/developing/tools/adb.html">Android Debug Bridge</a> (adb),
-you can issue commands with the <code>-d</code> flag to target your
-connected device.</p>
-
+<p>If using the <a href="{@docRoot}guide/developing/tools/adb.html">Android
+Debug Bridge</a> (adb), you can issue commands with the <code>-d</code> flag to
+target your connected device.</p>
<h3 id="VendorIds">USB Vendor IDs</h3>
-<p>This table provides a reference to the vendor IDs needed in order to add
-USB device support on Linux. The USB Vendor ID is the value given to the
-<code>SYSFS{idVendor}</code> property in the rules file, as described in step 3, above.</p>
+
+<p>This table provides a reference to the vendor IDs needed in order to add USB
+device support on Linux. The USB Vendor ID is the value given to the
+<code>ATTR{idVendor}</code> property in the rules file, as described
+above.</p>
<table>
<tr>
<th>Company</th><th>USB Vendor ID</th></tr>
<tr>
<td>Acer</td>
- <td><code>0502</code></td></tr>
+ <td><code>0502</code></td>
+ </tr>
+ <tr>
+ <td>ASUS</td>
+ <td><code>0b05</code></td>
+ </tr>
<tr>
<td>Dell</td>
- <td><code>413c</code></td></tr>
+ <td><code>413c</code></td>
+ </tr>
<tr>
<td>Foxconn</td>
- <td><code>0489</code></td></tr>
+ <td><code>0489</code></td>
+ </tr>
<tr>
<td>Garmin-Asus</td>
- <td><code>091E</code></td></tr>
+ <td><code>091E</code></td>
+ </tr>
<tr>
<td>Google</td>
- <td><code>18d1</code></td></tr>
+ <td><code>18d1</code></td>
+ </tr>
<tr>
<td>HTC</td>
- <td><code>0bb4</code></td></tr>
+ <td><code>0bb4</code></td>
+ </tr>
<tr>
<td>Huawei</td>
- <td><code>12d1</code></td></tr>
+ <td><code>12d1</code></td>
+ </tr>
<tr>
<td>K-Touch</td>
- <td><code>24e3</code></td></tr>
+ <td><code>24e3</code></td>
+ </tr>
+ <tr>
+ <td>KT Tech</td>
+ <td><code>2116</code></td>
+ </tr>
<tr>
<td>Kyocera</td>
- <td><code>0482</code></td></tr>
+ <td><code>0482</code></td>
+ </tr>
<tr>
<td>Lenevo</td>
- <td><code>17EF</code></td></tr>
+ <td><code>17EF</code></td>
+ </tr>
<tr>
<td>LG</td>
- <td><code>1004</code></td></tr>
+ <td><code>1004</code></td>
+ </tr>
<tr>
<td>Motorola</td>
- <td><code>22b8</code></td></tr>
+ <td><code>22b8</code></td>
+ </tr>
+ <tr>
+ <td>NEC</td>
+ <td><code>0409</code></td>
+ </tr>
+ <tr>
+ <td>Nook</td>
+ <td><code>2080</code></td>
+ </tr>
<tr>
<td>Nvidia</td>
- <td><code>0955</code></td></tr>
+ <td><code>0955</code></td>
+ </tr>
+ <tr>
+ <td>OTGV</td>
+ <td><code>2257</code></td>
+ </tr>
<tr>
<td>Pantech</td>
- <td><code>10A9</code></td></tr>
+ <td><code>10A9</code></td>
+ </tr>
+ <tr>
+ <td>Pegatron</td>
+ <td><code>0x1D4D</code></td>
+ </tr>
+ <tr>
+ <td>Philips</td>
+ <td><code>0471</code></td>
+ </tr>
+ <tr>
+ <td>PMC-Sierra</td>
+ <td><code>04da</code></td>
+ </tr>
+ <tr>
+ <td>Qualcomm</td>
+ <td><code>05c6</code></td>
+ </tr>
+ <tr>
+ <td>SK Telesys</td>
+ <td><code>1f53</code></td>
+ </tr>
<tr>
<td>Pegatron</td>
<td><code>0x1D4D</code></td></tr>
<tr>
<td>Samsung</td>
- <td><code>04e8</code></td></tr>
+ <td><code>04e8</code></td>
+ </tr>
<tr>
<td>Sharp</td>
- <td><code>04dd</code></td></tr>
+ <td><code>04dd</code></td>
+ </tr>
<tr>
<td>Sony Ericsson</td>
- <td><code>0fce</code></td></tr>
+ <td><code>0fce</code></td>
+ </tr>
+ <tr>
+ <td>Toshiba</td>
+ <td><code>0930</code></td>
+ </tr>
<tr>
<td>ZTE</td>
- <td><code>19D2</code></td></tr>
+ <td><code>19D2</code></td>
+ </tr>
</table>