diff options
author | Scott Main <smain@google.com> | 2011-02-02 16:44:55 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-02-02 16:44:55 -0800 |
commit | 45c66a0e1ce3d38c20804caaa6cda896187d88fb (patch) | |
tree | f4d9e930dd446e8a99760cdbfe09874affefc35b /docs | |
parent | 603b475e59d0ebcdb9bac297fc91e80cafbdb3a9 (diff) | |
parent | 94a6c689acb03ba01546a10933699bde22bb4a4c (diff) | |
download | frameworks_base-45c66a0e1ce3d38c20804caaa6cda896187d88fb.zip frameworks_base-45c66a0e1ce3d38c20804caaa6cda896187d88fb.tar.gz frameworks_base-45c66a0e1ce3d38c20804caaa6cda896187d88fb.tar.bz2 |
am 94a6c689: Merge "wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed" into gingerbread
* commit '94a6c689acb03ba01546a10933699bde22bb4a4c':
wholesale manual merge of docs from gingerbread-docs to gingerbread includes misc changes that occured for preview sdk and shortly after plus misc older stuff that got missed
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/guide/developing/device.jd | 10 | ||||
-rw-r--r-- | docs/html/guide/topics/manifest/supports-screens-element.jd | 42 | ||||
-rw-r--r-- | docs/html/images/developing/sdk-usb-driver.png | bin | 0 -> 120183 bytes | |||
-rw-r--r-- | docs/html/resources/index.jd | 4 | ||||
-rw-r--r-- | docs/html/resources/resources_toc.cs | 14 | ||||
-rw-r--r-- | docs/html/sdk/1.6_r1/upgrading.jd | 1 | ||||
-rw-r--r-- | docs/html/sdk/android-3.0-highlights.jd | 2 | ||||
-rw-r--r-- | docs/html/sdk/ndk/index.jd | 71 |
8 files changed, 103 insertions, 41 deletions
diff --git a/docs/html/guide/developing/device.jd b/docs/html/guide/developing/device.jd index 80a354f..f12c7d4 100644 --- a/docs/html/guide/developing/device.jd +++ b/docs/html/guide/developing/device.jd @@ -13,8 +13,8 @@ page.title=Developing on a Device </ol> <h2>See also</h2> <ol> - <li><a - href="{@docRoot}sdk/win-usb.html">USB Driver for Windows</a></li> + <li><a href="{@docRoot}sdk/win-usb.html">Google USB Driver</a></li> + <li><a href="{@docRoot}sdk/oem-usb.html">OEM USB Drivers</a></li> <li><a href="{@docRoot}guide/developing/eclipse-adt.html">Developing in Eclipse, with ADT</a></li> <li><a @@ -73,8 +73,10 @@ would on the emulator. Before you can start, there are just a few things to do:< <li>Setup your system to detect your device. <ul> <li>If you're developing on Windows, you need to install a USB driver - for adb. See the <a href="{@docRoot}sdk/win-usb.html">Windows USB - Driver</a> documentation.</li> + for adb. If you're using an Android Developer Phone (ADP), Nexus One, or Nexus S, + see the <a href="{@docRoot}sdk/win-usb.html">Google Windows USB + 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 diff --git a/docs/html/guide/topics/manifest/supports-screens-element.jd b/docs/html/guide/topics/manifest/supports-screens-element.jd index 620d3b2..64a7a58 100644 --- a/docs/html/guide/topics/manifest/supports-screens-element.jd +++ b/docs/html/guide/topics/manifest/supports-screens-element.jd @@ -9,6 +9,7 @@ page.title=<supports-screens> <supports-screens android:<a href="#small">smallScreens</a>=["true" | "false"] android:<a href="#normal">normalScreens</a>=["true" | "false"] android:<a href="#large">largeScreens</a>=["true" | "false"] + android:<a href="#xlarge">xlargeScreens</a>=["true" | "false"] android:<a href="#any">anyDensity</a>=["true" | "false"] /> </pre> </dd> @@ -31,7 +32,7 @@ or scale them up by a factor of 1.5 (high dpi screens). The screen density is expressed as dots-per-inch (dpi).</p> <p>For more information, see -<a href="{@docRoot}guide/practices/screens_support.html">Multiple Screens Support</a>.</p> +<a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a>.</p> <dt>attributes:</dt> @@ -43,8 +44,10 @@ The screen density is expressed as dots-per-inch (dpi).</p> the "normal" (traditional HVGA) screen. An application that does not support small screens <em>will not be available</em> for small screen devices, because there is little the platform can do - to make such an application work on a smaller screen. Applications using - API Level 4 or higher default this to "true", others are "false". + to make such an application work on a smaller screen. If the application has set the <a +href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code <uses-sdk>}</a> element's +{@code android:minSdkVersion} or {@code android:targetSdkVersion} attribute to "4" or higher, +the default value for this is "true", any value less than "4" results in this set to "false". </dd> <dt><a name="normal"></a>{@code android:normalScreens}</dt> @@ -60,15 +63,33 @@ The screen density is expressed as dots-per-inch (dpi).</p> A large screen is defined as a screen that is significantly larger than a "normal" phone screen, and thus may require some special care on the application's part to make good use of it. An application that - does not support large screens will be placed as a "postage stamp" on - such a screen, so that it retains the dimensions it was originally - designed for. Applications using API Level 4 or higher default - to "true", others are "false". + does not support large screens (declares this "false")—but does support "normal" or +"small" screens—will be placed as a "postage stamp" on + a large screen, so that it retains the dimensions it was originally + designed for. If the application has set the <a +href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code <uses-sdk>}</a> element's +{@code android:minSdkVersion} or {@code android:targetSdkVersion} attribute to "4" or higher, +the default value for this is "true", any value less than "4" results in this set to "false". + </dd> + + <dt><a name="xlarge"></a>{@code android:xlargeScreens}</dt> + <dd>Indicates whether the application supports extra large screen form-factors. + An xlarge screen is defined as a screen that is significantly larger + than a "large" screen, such as a tablet (or something larger) and may require special care + on the application's part to make good use of it. An application that + does not support xlarge screens (declares this "false")—but does support "large", +"normal", or "small" screens—will be placed as a "postage stamp" on + an xlarge screen, so that it retains the dimensions it was originally + designed for. If the application has set the <a +href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code <uses-sdk>}</a> element's +{@code android:minSdkVersion} or {@code android:targetSdkVersion} attribute to "4" or higher, +the default value for this is "true", any value less than "4" results in this set to "false". + <p>This attribute was introduced in API Level 9.</p> </dd> <dt><a name="any"></a>{@code android:anyDensity}</dt> - <dd>Indicates whether the application can accommodate any screen - density. Older applications (pre API Level 4) are assumed unable to + <dd>Indicates whether the application includes resources to accommodate any screen + density. Older applications (before API Level 4) are assumed unable to accomodate all densities and this is "false" by default. Applications using API Level 4 or higher are assumed able to and this is "true" by default. You can explicitly supply your abilities here. @@ -84,7 +105,8 @@ The screen density is expressed as dots-per-inch (dpi).</p> <dt>see also:</dt> <dd> <ul> - <li><a href="{@docRoot}guide/practices/screens_support.html">Multiple Screens Support</a></li> + <li><a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple +Screens</a></li> <li>{@link android.util.DisplayMetrics}</li> </ul> </dd> diff --git a/docs/html/images/developing/sdk-usb-driver.png b/docs/html/images/developing/sdk-usb-driver.png Binary files differnew file mode 100644 index 0000000..207d3d7 --- /dev/null +++ b/docs/html/images/developing/sdk-usb-driver.png diff --git a/docs/html/resources/index.jd b/docs/html/resources/index.jd index 699952a..1668721 100644 --- a/docs/html/resources/index.jd +++ b/docs/html/resources/index.jd @@ -29,10 +29,6 @@ techniques that you find in the samples!</dd> <dd>Links to the Android discussion groups and information about other ways to collaborate with other developers. </dd> -<dt><b>Webinars</b></dt> -<dd>Online training videos on wide range of Android topics -coupled with live IRC chat sessions for discussions. </dd> - <dt><b>More</b></dt> <dd>Quick development tips, troubleshooting information, and frequently asked questions (FAQs). </dd> diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs index fe5b7de..a273737 100644 --- a/docs/html/resources/resources_toc.cs +++ b/docs/html/resources/resources_toc.cs @@ -276,18 +276,8 @@ </li> </ul> </li> - <!-- Webinar section --> - <li> - <h2><span class="en">Webinars</span></h2> - <ul> - <li><a href="<?cs var:toroot ?>resources/webinars/webinar-watch.html"> - <span class="en">Watch a Webinar</span> - </a></li> - <li><a href="<?cs var:toroot ?>resources/webinars/webinar-upcoming.html"> - <span class="en">Upcoming Schedule</span> - </a></li> - </ul> - </li> + + <li> <h2><span class="en">More</span> diff --git a/docs/html/sdk/1.6_r1/upgrading.jd b/docs/html/sdk/1.6_r1/upgrading.jd index ebe6a95..49535c9 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 ed49307..0378c35 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 <p style="margin-top:1em;margin-bottom:.75em;"><strong>Camera and Gallery</strong></p> -<p>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. </p> +<p>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. </p> <p style="margin-top:1em;margin-bottom:.75em;"><strong>Contacts</strong></p> diff --git a/docs/html/sdk/ndk/index.jd b/docs/html/sdk/ndk/index.jd index 8b27f37..2f53305 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 @@ -59,11 +59,64 @@ padding: .25em 1em; } </style> + <div class="toggleable open"> <a href="#" onclick="return toggleDiv(this)"><img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" + width="9px" /> Android NDK, Revision 5b</a> <em>(January 2011)</em> + + <div class="toggleme"> + <p>This release of the NDK does not include any new features compared to r5. The r5b release addresses the + following problems in the r5 release: + </p> + <ul> + <li>The r5 binaries required glibc 2.11, but the r5b binaries are generated with a special + toolchain that targets glibc 2.7 or higher instead. The Linux toolchain binaries now run on Ubuntu 8.04 or higher. </li> + <li>Fixes a compiler bug in the arm-linux-androideabi-4.4.3 toolchain. + The previous binary generated invalid thumb instruction sequences when + dealing with signed chars.</li> + <li>Adds missing documentation for the + "gnustl_static" value for APP_STL, that allows you to link against + a static library version of GNU libstdc++. </li> + <li>The following <code>ndk-build</code> issues are fixed: + <ul> + <li>A bug that created inconsistent dependency files when a + compilation error occured on Windows. This prevented a proper build after + the error was fixed in the source code.</li> + <li>A Cygwin-specific bug where using very short paths for + the Android NDK installation or the project path led to the + generation of invalid dependency files. This made incremental builds + impossible.</li> + <li>A typo that prevented the cpufeatures library from working correctly + with the new NDK toolchain.</li> + <li>Builds in Cygwin are faster by avoiding calls to <code>cygpath -m</code> + from GNU Make for every source or object file, which caused problems + with very large source trees. In case this doesn't work properly, define <code>NDK_USE_CYGPATH=1</code> in your + environment to use <code>cygpath -m</code> again.</li> + <li>The Cygwin installation now notifies the user of invalid installation paths that contain spaces. Previously, an invalid path + would output an error that complained about an incorrect version of GNU Make, even if the right one was installed. + </ul> + </li> + <li>Fixed a typo that prevented the <code>NDK_MODULE_PATH</code> environment variable from working properly when + it contained multiple directories separated with a colon. </li> + <li>The <code>prebuilt-common.sh</code> script contains fixes to check the compiler for 64-bit + generated machine code, instead of relying on the host tag, which + allows the 32-bit toolchain to rebuild properly on Snow Leopard. The toolchain rebuild scripts now also support + using a 32-bit host toolchain.</li> + <li>A missing declaration for <code>INET_ADDRSTRLEN</code> was added to <code><netinet/in.h></code>.</li> + <li>Missing declarations for <code>IN6_IS_ADDR_MC_NODELOCAL</code> and <code>IN6_IS_ADDR_MC_GLOBAL</code> were added to <code><netinet/in6.h></code>.</li> + <li>'asm' was replaced with '__asm__' in <code><asm/byteorder.h></code> to allow compilation with <code>-std=c99</code>.</li> + </ul> + </div> + </div> + +<div class="toggleable closed"> + <a href="#" + onclick="return toggleDiv(this)"><img src="{@docRoot}assets/images/triangle-closed.png" + class="toggle-img" + height="9px" width="9px" /> Android NDK, Revision 5</a> <em>(December 2010)</em> <div class="toggleme"> @@ -73,7 +126,7 @@ padding: .25em 1em; graphics and window management, assets, and storage. Developers can also implement the Android application lifecycle in native code with help from the new {@link android.app.NativeActivity} class. For detailed information describing the changes in this - release, read the CHANGES.HTML document included in the downloaded NDK package. + release, read the <code>CHANGES.HTML</code> document included in the downloaded NDK package. </p> <dl> <dt>General notes:</dt> |