From c2ab8e41d081395b5b7577ae60ab73e94d7c37e4 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Fri, 28 Jan 2011 09:34:27 -0800 Subject: [PATCH] cherrypick Change-Id: I350a012817e6e9fa76fa0e58ab252d457cd103f2 Plus some misc changes to merge from Change-Id: Ibb8490b2c6bae2d9df15326c7ffbcf83b638acc6 update OEM driver list with new fujitsu and kyocera Change-Id: I8ea9d1056a3dd7ed307cfee7a698e547536a2821 --- docs/html/sdk/1.6_r1/upgrading.jd | 1 - docs/html/sdk/android-3.0-highlights.jd | 2 +- docs/html/sdk/ndk/index.jd | 16 ++++----- docs/html/sdk/oem-usb.jd | 48 +++++++++++++++++-------- 4 files changed, 43 insertions(+), 24 deletions(-) diff --git a/docs/html/sdk/1.6_r1/upgrading.jd b/docs/html/sdk/1.6_r1/upgrading.jd index ebe6a95c8ee94..49535c9bc011d 100644 --- a/docs/html/sdk/1.6_r1/upgrading.jd +++ b/docs/html/sdk/1.6_r1/upgrading.jd @@ -1,6 +1,5 @@ page.title=Upgrading the SDK sdk.version=1.6 -sdk.preview=0 @jd:body diff --git a/docs/html/sdk/android-3.0-highlights.jd b/docs/html/sdk/android-3.0-highlights.jd index ed493071826a5..0378c35fcd603 100644 --- a/docs/html/sdk/android-3.0-highlights.jd +++ b/docs/html/sdk/android-3.0-highlights.jd @@ -129,7 +129,7 @@ This document provides a glimpse of some of the new features and technologies, a

Camera and Gallery

-

The Camera application has been redesigned to take advantage of a larger screen for quick access to exposure, focus, flash, zoom, front-facing camera, and more. To let users capture scenes in new ways, it adds built-in support for time-lapse video recording. Gallery application lets users view albums and other collections in full-screen mode, with easy access to thumbnails for other photos in the collection.

+

The Camera application has been redesigned to take advantage of a larger screen for quick access to exposure, focus, flash, zoom, front-facing camera, and more. To let users capture scenes in new ways, it adds built-in support for time-lapse video recording. The Gallery application lets users view albums and other collections in full-screen mode, with easy access to thumbnails for other photos in the collection.

Contacts

diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd index 2c3fd6aa869a4..2f533051dae2b 100644 --- a/docs/html/sdk/ndk/index.jd +++ b/docs/html/sdk/ndk/index.jd @@ -1,16 +1,16 @@ ndk=true -ndk.win_download=android-ndk-r5-windows.zip -ndk.win_bytes=62217450 -ndk.win_checksum=59cbb02d91d74e9c5c7278d94c989e80 +ndk.win_download=android-ndk-r5b-windows.zip +ndk.win_bytes=61299831 +ndk.win_checksum=87745ada305ab639399161ab4faf684c -ndk.mac_download=android-ndk-r5-darwin-x86.tar.bz2 +ndk.mac_download=android-ndk-r5b-darwin-x86.tar.bz2 ndk.mac_bytes=50210863 -ndk.mac_checksum=9dee8e4cb529a5619e9b8d1707478c32 +ndk.mac_checksum=019a14622a377b3727ec789af6707037 -ndk.linux_download=android-ndk-r5-linux-x86.tar.bz2 -ndk.linux_bytes=44362746 -ndk.linux_checksum=49d5c35ec02bafc074842542c58b7eb3 +ndk.linux_download=android-ndk-r5b-linux-x86.tar.bz2 +ndk.linux_bytes=44138539 +ndk.linux_checksum=4c0045ddc2bfd657be9d5177d0e0b7e7 page.title=Android NDK @jd:body diff --git a/docs/html/sdk/oem-usb.jd b/docs/html/sdk/oem-usb.jd index 14015f5520243..e64c8d27dff64 100644 --- a/docs/html/sdk/oem-usb.jd +++ b/docs/html/sdk/oem-usb.jd @@ -12,18 +12,18 @@ page.title=OEM USB Drivers

If you are developing on Windows and would like to connect an Android-powered device - to test your applications, then you need to install the appropriate USB driver. This document -provides links to the web sites for several device original equipment manufacturers (OEMs), +to test your applications, then you need to install the appropriate USB driver. This document +provides links to the web sites for several original equipment manufacturers (OEMs), where you can download the appropriate USB driver for your device. However, this list is not exhaustive for all available Android-powered devices.

-

If your device is one of the Android Developer Phones (ADP), a Nexus One, or a Nexus S, -then you should instead use the Google USB Driver.

+

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.

-

Note: 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.

+

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 should +use the Google USB Driver, instead of an OEM driver.

For instructions about how to install the driver on Windows, follow the guide for Installing the USB Driver.

@@ -38,24 +38,44 @@ mobile.html Dell - http://support.dell.com/support/downloads/index.aspx?c=us&cs=19&l=en&s=dhs&~ck=anavml + http:// +support.dell.com/support/downloads/index.aspx?c=us&cs=19&l=en&s=dhs&~ck=anavml Foxconn http://drivers.cmcs.com.tw/ -Garmin-Asus + + + Fujitsu Toshiba + + http://www.fmworld.net/product/phone/sp/android/develop/ + + + + Garmin-Asus + https://www.garminasus.com/en_US/support/ pcsync/ -HTC http://www.htc.com
Click on the +HTC http://www.htc.com
Click on the support tab to select your products/device. Different regions will have different links. Huawei http://www.huaweidevice.com/worldwide/downloadCenter.do?method=list&flay=software& +href="http://www.huaweidevice.com/worldwide/downloadCenter.do?method=list&flay=software&directoryId=20&treeId=0">http://www.huaweidevice.com/worldwide/downloadCenter.do?method=list&flay=software& directoryId=20&treeId=0 KT Tech http://www.kttech.co.kr/cscenter/download05. asp for EV-S100(Take) -LGE + + + Kyocera + + http://www.kyocera-wireless.com/ + + + LGE http:// www.lg.com/us/mobile-phones/mobile-support/mobile-lg-mobile-phone-support.jsp Motorola