From 0f8056321f4d4552fb96a671c3cd194814ad0d4e Mon Sep 17 00:00:00 2001 From: Scott Main Date: Fri, 7 Jan 2011 10:45:03 -0800 Subject: [PATCH] cherrypick Change-Id: Ic268b65b127b356155dd62d737029ce442c12f51 docs: add OEM USB Drivers document and update install guide with windows 7 procedures misc style edits Change-Id: Icadbfc1136463a75039f87e7c0cbc79d29afbd84 --- docs/html/guide/developing/device.jd | 12 +- .../html/images/developing/sdk-usb-driver.png | Bin 0 -> 120183 bytes docs/html/sdk/oem-usb.jd | 81 +++++ docs/html/sdk/sdk_toc.cs | 6 +- docs/html/sdk/win-usb.jd | 311 ++++++++++-------- 5 files changed, 272 insertions(+), 138 deletions(-) create mode 100644 docs/html/images/developing/sdk-usb-driver.png create mode 100644 docs/html/sdk/oem-usb.jd diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd index 4bed963ce6efb..657f5495c991e 100644 --- a/docs/html/guide/developing/device.jd +++ b/docs/html/guide/developing/device.jd @@ -13,8 +13,12 @@ page.title=Connecting Hardware Devices

See also

    +
  1. Google USB Driver
  2. +
  3. OEM USB Drivers
  4. USB Driver for Windows
  5. +href="{@docRoot}guide/developing/eclipse-adt.html">Developing in Eclipse, with ADT +
  6. Developing in other IDEs
@@ -66,8 +70,10 @@ would on the emulator. Before you can start, there are just a few things to do:<
  • Setup your system to detect your device.
  • @@ -156,6 +155,9 @@
      +
    • + OEM USB Drivers +
    • SDK System Requirements
    • diff --git a/docs/html/sdk/win-usb.jd b/docs/html/sdk/win-usb.jd index 1f74ffed4861d..ffaec4c8b6f33 100644 --- a/docs/html/sdk/win-usb.jd +++ b/docs/html/sdk/win-usb.jd @@ -1,4 +1,4 @@ -page.title=USB Driver for Windows +page.title=Google USB Driver @jd:body -

      The USB driver for Windows is a downloadable component for the -Android SDK. If you are developing on Windows and would like to -connect an Android-powered device to test your applications, then you will need -to install the USB driver.

      +

      The Google USB driver is a downloadable component for Windows developers, available +for download from the AVD and SDK Manager.

      -

      This document provides information about the latest version of the -USB driver and a guide to installing the driver on your development -computer.

      +

      The Google USB Driver is only for Android Developer Phones (ADP), Nexus One, and Nexus S. +If you're using a different Android-powered device, +then you need to get a USB driver from the device OEM. For help finding the appropriate +driver, see the list of OEM USB Drivers.

      + +

      Note: If you're developing on Mac OS X or Linux, then you do not need to install a @@ -34,6 +55,12 @@ USB driver. Refer to Setting up a Device to start development with a device.

      +

      The sections below provide instructions on how to download the USB Driver +for Windows and install it on your development computer.

      + + + +

      Revisions

      The sections below provide notes about successive revisions of the USB Driver @@ -132,77 +159,49 @@ for the T-Mobile G1 and myTouch 3G (and similar devices).

      -

      Installing the USB Driver for Windows

      -