diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd
index d390ec1474d18..d22dca1fee41b 100644
--- a/docs/html/guide/developing/device.jd
+++ b/docs/html/guide/developing/device.jd
@@ -51,19 +51,13 @@ would on the emulator. Before you can start, there are just a few things to do:<
- Declare your application as "debuggable" in your Android Manifest.
-
In Eclipse, you can do this from the Application tab when viewing the Manifest
- (on the right side, set Debuggable to true). Otherwise, in the
-AndroidManifest.xml
- file, add android:debuggable="true" to the <application>
-element.
-
- - Set up your device to allow installation of non-Market applications.
On
-the device, go to Settings > Applications and enable
-
-Unknown sources (on an Android 4.0 device, the setting is
-located in Settings > Security).
-
-
+ When using Eclipse, you can skip this step, because running your app directly from
+the Eclipse IDE automatically enables debugging.
+ In the AndroidManifest.xml file, add android:debuggable="true" to
+the <application> element.
+ Note: If you manually enable debugging in the manifest
+ file, be sure to disable it before you build for release (your published application
+should usually not be debuggable).
- Turn on "USB Debugging" on your device.
On the device, go to Settings > Applications > Development
and enable USB debugging
@@ -72,13 +66,10 @@ located in Settings > Developer options).
- Set up your system to detect your device.
- - 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,
- see the Google Windows USB
- Driver. Otherwise, you can find a link to the appropriate OEM driver in the
- OEM USB Drivers document.
+ - If you're developing on Windows, you need to install a USB driver for adb. For an
+installation guide and links to OEM drivers, see the OEM USB
+Drivers document.
- If you're developing on Mac OS X, it just works. Skip this step.
-
- If you're developing on Ubuntu Linux, you need to add a
udev 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
@@ -114,7 +105,7 @@ rules.
-You can verify that your device is connected by executing adb
+When plugged in over USB, can verify that your device is connected by executing adb
devices from your SDK {@code platform-tools/} directory. If connected,
you'll see the device name listed as a "device."
diff --git a/docs/html/sdk/oem-usb.jd b/docs/html/sdk/oem-usb.jd
index b81be71dc079f..f98257df00274 100644
--- a/docs/html/sdk/oem-usb.jd
+++ b/docs/html/sdk/oem-usb.jd
@@ -3,9 +3,21 @@ page.title=OEM USB Drivers
@@ -18,8 +30,185 @@ where you can download the appropriate USB driver for your device. However, this
not exhaustive for all available Android-powered devices.
If you're developing on Mac OS X or Linux, then you probably don't need to install a USB driver.
-Refer to Setting up a Device to
-start development with a device.
+To start developing with your device, read
Using Hardware Devices.
+
+
Note: If your device is one of the Android Developer Phones
+(purchased from the Android Market publisher site), a Nexus One, or a Nexus S, then you need
+the Google USB Driver, instead of an OEM driver. The Galaxy
+Nexus driver, however, is distributed by Samsung
+(listed as model SCH-I515).
+
+
+
Installing a USB Driver
+
+
First, find the appropriate driver for your device from the OEM drivers
+table below.
+
+
Once you've downloaded your USB driver, follow the instructions below to install or upgrade the
+driver, based on your version of Windows and whether you're installing for the first time
+or upgrading an existing driver.
+
+
Tip: When you finish the USB driver installation,
+see Using Hardware Devices for
+other important information about using an Android-powered device for
+development.
+
+
+ - Windows 7
+ - Windows XP
+ - Windows Vista
+
+
+
+
Caution:
+You may make changes to android_winusb.inf file found inside
+usb_driver\ (for example, to add support for other devices),
+however, this will lead to security warnings when you install or upgrade the
+driver. Making any other changes to the driver files may break the installation
+process.
+
+
+
Windows 7
+
+
+
To install the Android USB driver on Windows 7 for the first time:
+
+ - Connect your Android-powered device to your computer's USB port.
+ - Right-click on Computer from your desktop or Windows Explorer,
+ and select Manage.
+ - Select Devices in the left pane.
+ - Locate and expand Other device in the right pane.
+ - Right-click the device name (such as Nexus S) and select Update
+ Driver Software.
+ This will launch the Hardware Update Wizard.
+ - Select Browse my computer for driver software and click
+ Next.
+ - Click Browse and locate the USB driver folder. (The Google USB
+Driver is located in {@code <sdk>\extras\google\usb_driver\}.)
+ - Click Next to install the driver.
+
+
+
Or, to upgrade an existing Android USB driver on Windows 7 with the new
+driver:
+
+
+ - Connect your Android-powered device to your computer's USB port.
+ - Right-click on Computer from your desktop or Windows Explorer,
+ and select Manage.
+ - Select Device Manager in the left pane of the Computer Management
+ window.
+ - Locate and expand Android Phone in the right pane.
+ - Right-click Android Composite ADB Interface and select Update
+ Driver.
+ This will launch the Hardware Update Wizard.
+ - Select Install from a list or specific location and click
+ Next.
+ - Select Search for the best driver in these locations; un-check
+Search removable media; and check Include this location in the
+search.
+ - Click Browse and locate the USB driver folder. (The Google USB
+Driver is located in {@code <sdk>\extras\google\usb_driver\}.)
+ - Click Next to upgrade the driver.
+
+
+
+
+
+
+
Windows XP
+
+
To install the Android USB driver on Windows XP for the first time:
+
+
+ - Connect your Android-powered device to your computer's USB port. Windows
+ will detect the device and launch the Hardware Update Wizard.
+ - Select Install from a list or specific location and click
+ Next.
+ - Select Search for the best driver in these locations; un-check
+Search
+ removable media; and check Include
+this location in the search.
+ - Click Browse and locate the USB driver folder. (The Google USB
+Driver is located in {@code <sdk>\extras\google\usb_driver\}.)
+ - Click Next to install the driver.
+
+
+
Or, to upgrade an existing Android USB driver on Windows XP with the new
+driver:
+
+
+ - Connect your Android-powered device to your computer's USB port.
+ - Right-click on My Computer from your desktop or Windows Explorer,
+ and select Manage.
+ - Select Device Manager in the left pane.
+ - Locate and expand Android Phone in the right pane.
+ - Right-click Android Composite ADB Interface and select Update
+ Driver.
+ This will launch the Hardware Update Wizard.
+ - Select Install from a list or specific location and click
+ Next.
+ - Select Search for the best driver in these locations; un-check Search
+ removable media; and check Include
+this location in the search.
+ - Click Browse and locate the USB driver folder. (The Google USB
+Driver is located in {@code <sdk>\extras\google\usb_driver\}.)
+ - Click Next to upgrade the driver.
+
+
+
+
+
Windows Vista
+
+
To install the Android USB driver on Windows Vista for the first time:
+
+
+ - Connect your Android-powered device to your computer's USB port. Windows
+ will detect the device and launch the Found New Hardware wizard.
+ - Select Locate and install driver software.
+ - Select Don't search online.
+ - Select I don't have the disk. Show me other options.
+ - Select Browse my computer for driver software.
+ - Click Browse and locate the USB driver folder. (The Google USB
+Driver is located in {@code <sdk>\extras\google\usb_driver\}.) As long as you specified the
+exact location of the
+ installation package, you may leave Include subfolders checked or
+ unchecked—it doesn't matter.
+ - Click Next. Vista may prompt you to confirm the privilege elevation
+ required for driver installation. Confirm it.
+ - When Vista asks if you'd like to install the Google ADB Interface device,
+ click Install to install the driver.
+
+
+
Or, to upgrade an existing Android USB driver on Windows Vista with the new
+driver:
+
+
+ - Connect your Android-powered device to your computer's USB port.
+ - Right-click on Computer from your desktop or Windows Explorer,
+ and select Manage.
+ - Select Device Manager in the left pane.
+ - Locate and expand ADB Interface in the right pane.
+ - Right-click on HTC Dream Composite ADB Interface, and select Update
+ Driver Software.
+ - When Vista starts updating the driver, a prompt will ask how you want to
+ search for the driver
+ software. Select Browse my computer for driver software.
+ - Click Browse and locate the USB driver folder. (The Google USB
+Driver is located in {@code <sdk>\extras\google\usb_driver\}.) As long as you specified the
+exact location of the
+ installation package, you may leave Include subfolders checked or
+ unchecked—it doesn't matter.
+ - Click Next. Vista might prompt you to confirm the privilege elevation
+ required for driver installation. Confirm it.
+ - When Vista asks if you'd like to install the Google ADB Interface device,
+ click Install to upgrade the driver.
+
+
+
+
OEM Drivers
Note: If your device is one of the Android Developer Phones
(purchased from the Android Market publisher site), a Nexus One, or a Nexus S, then you need
@@ -28,10 +217,7 @@ Nexus driver, however, is distributed by Samsung
(listed as model SCH-I515).
-
For instructions about how to install the driver on Windows, follow the guide for Installing the USB Driver.
-
Table 1. Links to OEM USB drivers
| OEM |
Driver URL |
@@ -92,7 +278,7 @@ href="http://www.huaweidevice.com/worldwide/downloadCenter.do?method=index">http
| KT Tech | http://www.kttech.co.kr/cscenter/download05.asp for EV-S100(Take) |
+href="http://www.kttech.co.kr/cscenter/download05.asp">http://www.kttech.co.kr/cscenter/download05.asp for EV-S100 (Take)
diff --git a/docs/html/sdk/win-usb.jd b/docs/html/sdk/win-usb.jd
index 2d1435b8d4b5f..2bd031ebb8b36 100644
--- a/docs/html/sdk/win-usb.jd
+++ b/docs/html/sdk/win-usb.jd
@@ -7,19 +7,12 @@ page.title=Google USB Driver
- Revisions
- Downloading the Google USB Driver
- - Installing the USB Driver
-
- - Windows 7
- - Windows XP
- - Windows Vista
-
-
See also
- - Developing on a Device
+ - Installing a USB Driver
+ - Using Hardware Devices
- Adding SDK Components
- - OEM USB Drivers
@@ -43,9 +36,9 @@ href="http://www.samsung.com/us/support/downloads/verizon-wireless/SCH-I515MSAVZ
(listed as model SCH-I515).
Note:
-If you're developing on Mac OS X or Linux, then you do not need to install a USB driver. Refer to Setting up a Device to start
-development with a device.
+If you're developing on Mac OS X or Linux, then you do not need to install a USB driver. To start
+developing with your device, also read Using
+Hardware Devices.
The sections below provide instructions on how to download and install the Google USB Driver
for Windows.
@@ -170,174 +163,10 @@ included with the Android SDK:
- Launch the SDK and AVD Manager by double-clicking
SDK Manager.exe,
at the root of your SDK directory.
- - Expand the Third party Add-ons and Google Inc. add-ons.
- - Check Google Usb Driver package and click Install selected.
+ - Expand Extras.
+ - Check Google USB Driver package and click Install.
- Proceed to install the package. When done, the driver files are
downloaded into the
<sdk>\extras\google\usb_driver\ directory.
-
-
-Installing the USB Driver
-
-Once you've downloaded your USB driver, follow the instructions below to install or upgrade the
-driver, based on your version of Windows and whether you're installing for the first time
-or upgrading an existing driver.
-
-Tip: When you finish the USB driver installation,
-see Developing on a Device for
-other important information about using an Android-powered device for
-development.
-
-
- - Windows 7
- - Windows XP
- - Windows Vista
-
-
-
-Caution:
-You may make changes to android_winusb.inf file found inside
-usb_driver\ (for example, to add support for other devices),
-however, this will lead to security warnings when you install or upgrade the
-driver. Making any other changes to the driver files may break the installation
-process.
-
-
-Windows 7
-
-
-To install the Android USB driver on Windows 7 for the first time:
-
- - Connect your Android-powered device to your computer's USB port.
- - Right-click on Computer from your desktop or Windows Explorer,
- and select Manage.
- - Select Devices in the left pane.
- - Locate and expand Other device in the right pane.
- - Right-click the device name (such as Nexus S) and select Update
- Driver Software.
- This will launch the Hardware Update Wizard.
- - Select Browse my computer for driver software and click
- Next.
- - Click Browse and locate the USB driver folder. (The Google USB
-Driver is located in {@code <sdk>\extras\google\usb_driver\}.)
- - Click Next to install the driver.
-
-
-Or, to upgrade an existing Android USB driver on Windows 7 with the new
-driver:
-
-
- - Connect your Android-powered device to your computer's USB port.
- - Right-click on Computer from your desktop or Windows Explorer,
- and select Manage.
- - Select Device Manager in the left pane of the Computer Management
- window.
- - Locate and expand Android Phone in the right pane.
- - Right-click Android Composite ADB Interface and select Update
- Driver.
- This will launch the Hardware Update Wizard.
- - Select Install from a list or specific location and click
- Next.
- - Select Search for the best driver in these locations; un-check
-Search removable media; and check Include this location in the
-search.
- - Click Browse and locate the USB driver folder. (The Google USB
-Driver is located in {@code <sdk>\extras\google\usb_driver\}.)
- - Click Next to upgrade the driver.
-
-
-
-
-
-
-Windows XP
-
-To install the Android USB driver on Windows XP for the first time:
-
-
- - Connect your Android-powered device to your computer's USB port. Windows
- will detect the device and launch the Hardware Update Wizard.
- - Select Install from a list or specific location and click
- Next.
- - Select Search for the best driver in these locations; un-check
-Search
- removable media; and check Include
-this location in the search.
- - Click Browse and locate the USB driver folder. (The Google USB
-Driver is located in {@code <sdk>\extras\google\usb_driver\}.)
- - Click Next to install the driver.
-
-
-Or, to upgrade an existing Android USB driver on Windows XP with the new
-driver:
-
-
- - Connect your Android-powered device to your computer's USB port.
- - Right-click on My Computer from your desktop or Windows Explorer,
- and select Manage.
- - Select Device Manager in the left pane.
- - Locate and expand Android Phone in the right pane.
- - Right-click Android Composite ADB Interface and select Update
- Driver.
- This will launch the Hardware Update Wizard.
- - Select Install from a list or specific location and click
- Next.
- - Select Search for the best driver in these locations; un-check Search
- removable media; and check Include
-this location in the search.
- - Click Browse and locate the USB driver folder. (The Google USB
-Driver is located in {@code <sdk>\extras\google\usb_driver\}.)
- - Click Next to upgrade the driver.
-
-
-
-
-Windows Vista
-
-To install the Android USB driver on Windows Vista for the first time:
-
-
- - Connect your Android-powered device to your computer's USB port. Windows
- will detect the device and launch the Found New Hardware wizard.
- - Select Locate and install driver software.
- - Select Don't search online.
- - Select I don't have the disk. Show me other options.
- - Select Browse my computer for driver software.
- - Click Browse and locate the USB driver folder. (The Google USB
-Driver is located in {@code <sdk>\extras\google\usb_driver\}.) As long as you specified the
-exact location of the
- installation package, you may leave Include subfolders checked or
- unchecked—it doesn't matter.
- - Click Next. Vista may prompt you to confirm the privilege elevation
- required for driver installation. Confirm it.
- - When Vista asks if you'd like to install the Google ADB Interface device,
- click Install to install the driver.
-
-
-Or, to upgrade an existing Android USB driver on Windows Vista with the new
-driver:
-
-
- - Connect your Android-powered device to your computer's USB port.
- - Right-click on Computer from your desktop or Windows Explorer,
- and select Manage.
- - Select Device Manager in the left pane.
- - Locate and expand ADB Interface in the right pane.
- - Right-click on HTC Dream Composite ADB Interface, and select Update
- Driver Software.
- - When Vista starts updating the driver, a prompt will ask how you want to
- search for the driver
- software. Select Browse my computer for driver software.
- - Click Browse and locate the USB driver folder. (The Google USB
-Driver is located in {@code <sdk>\extras\google\usb_driver\}.) As long as you specified the
-exact location of the
- installation package, you may leave Include subfolders checked or
- unchecked—it doesn't matter.
- - Click Next. Vista might prompt you to confirm the privilege elevation
- required for driver installation. Confirm it.
- - When Vista asks if you'd like to install the Google ADB Interface device,
- click Install to upgrade the driver.
-
-
+For installation information, read Installing a USB Driver.
|