diff options
author | Scott Main <smain@google.com> | 2013-07-24 15:21:35 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-07-24 15:21:35 +0000 |
commit | fc78f9ae3da1d9b0de161c0ff28ac7f68691310c (patch) | |
tree | 58b132ddc910c441ac8293030c627eb83e08067d /docs/html/tools | |
parent | 84f2a0f5e7a2ae63f4bc64f494b2aa6c94e7eb5a (diff) | |
parent | a9a65c64ae60bef828b9dfadc71ff638f6b1838a (diff) | |
download | frameworks_base-fc78f9ae3da1d9b0de161c0ff28ac7f68691310c.zip frameworks_base-fc78f9ae3da1d9b0de161c0ff28ac7f68691310c.tar.gz frameworks_base-fc78f9ae3da1d9b0de161c0ff28ac7f68691310c.tar.bz2 |
Merge "docs: small fixes for Support Library Guide" into jb-mr2-ub-dev
Diffstat (limited to 'docs/html/tools')
-rw-r--r-- | docs/html/tools/support-library/features.jd | 16 | ||||
-rw-r--r-- | docs/html/tools/support-library/index.jd | 15 | ||||
-rw-r--r-- | docs/html/tools/support-library/setup.jd | 8 |
3 files changed, 19 insertions, 20 deletions
diff --git a/docs/html/tools/support-library/features.jd b/docs/html/tools/support-library/features.jd index a749a36..12fc0ae 100644 --- a/docs/html/tools/support-library/features.jd +++ b/docs/html/tools/support-library/features.jd @@ -28,30 +28,30 @@ page.title=Support Library Features </div> </div> -<p>The Android Support Library package contains several individual libraries that can be included +<p>The Android Support Library package contains several libraries that can be included in your application. Each of these libraries supports a specific range of Android platform versions and set of features.</p> <p>This guide explains the important features and version support provided by the Support - Libraries, to help you decide which of them you should include in your application. In general, + Libraries to help you decide which of them you should include in your application. In general, we recommend including the <a href="#v4">v4 support</a> and <a href="#v7-appcompat">v7 - appcompat</a> libraries in your application, because they support a wide range of + appcompat</a> libraries, because they support a wide range of Android versions and provide APIs for recommended user interface patterns.</p> <p>In order to use any of the following libraries, you must download the library files to your Android SDK installation. Follow the directions for downloading the Support Libraries in <a href="{@docRoot}tools/support-library/setup.html#download">Support Library Setup</a> to complete this step. You must take additional steps to include a specific Support Library in - your application. See the end of each library section below for instructions on how to include - the library in your application.</p> + your application. See the end of each library section below for important information on how to + include the library in your application.</p> <h2 id="v4">v4 Support Library</h2> <p>This library is designed to be used with Android 1.6 (API level 4) and higher. It includes the - largest set of APIs compared to the other packages, including support for application components, + largest set of APIs compared to the other libraries, including support for application components, user interface features, accessibility, data handling, network connectivity, and programming - utilities. Here are a few of the key classes included in the v4 package:</p> + utilities. Here are a few of the key classes included in the v4 library:</p> <ul> <li>App Components @@ -128,7 +128,7 @@ page.title=Support Library Features </ul> <p> - There are many other APIs included in this package. For complete, detailed information about the + There are many other APIs included in this library. For complete, detailed information about the v4 Support Library APIs, see the {@link android.support.v4.app android.support.v4} package in the API reference. </p> diff --git a/docs/html/tools/support-library/index.jd b/docs/html/tools/support-library/index.jd index e5efb8d..420fa0f 100644 --- a/docs/html/tools/support-library/index.jd +++ b/docs/html/tools/support-library/index.jd @@ -24,14 +24,13 @@ page.title=Support Library <p>The Android Support Library package is a set of code libraries that provide useful and important features for Android applications in addition to the framework APIs. These libraries provide - backward-compatible versions of framework APIs as well as features that are only available - through its API. Each Support Library is backward-compatible to a specific Android API level. - This design means that your applications can use the libraries' features and still be compatible - with devices running Android 1.6 (API level 4) and up.</p> - -<p>This guide provides information about what features are enabled by the different libraries, - how to use them in your development environment and information about the Support Library - releases.</p> + backward-compatible versions of Android framework APIs as well as features that are only available + through the library APIs. Each Support Library is backward-compatible to a specific Android API + level. This design means that your applications can use the libraries' features and still be + compatible with devices running Android 1.6 (API level 4) and up.</p> + +<p>This guide provides information about what features are enabled by the Support Libraries, + how to use them in your development environment and information about library releases.</p> <h2 id="overview">Overview</h2> diff --git a/docs/html/tools/support-library/setup.jd b/docs/html/tools/support-library/setup.jd index a2ece15..6cca897 100644 --- a/docs/html/tools/support-library/setup.jd +++ b/docs/html/tools/support-library/setup.jd @@ -113,10 +113,10 @@ Android Support Library selected.</p> <ol> <li>Make sure you have downloaded the <strong>Android Support Library</strong> using the <a href="#download">SDK Manager</a>.</li> - <li>Create a {@code /libs} directory in the root of your application project.</li> + <li>Create a {@code libs/} directory in the root of your application project.</li> <li>Copy the JAR file from your Android SDK installation directory (e.g., {@code <sdk>/extras/android/support/v4/android-support-v4.jar}) into your - application's project {@code /libs} directory. + application's project {@code libs/} directory. <li>Right click the JAR file and select <strong>Build Path > Add to Build Path</strong>. </li> </ol> @@ -130,7 +130,7 @@ Android Support Library selected.</p> <div class="toggle-content-toggleme"> <ol> - <li>Make sure you have downloaded the <strong>Android Support Repository</strong>. + <li>Make sure you have downloaded the <strong>Android Support Repository</strong> using the <a href="#download">SDK Manager</a>.</li> <li>Open the {@code build.gradle} file for your application.</li> <li>Add the support library to the {@code dependencies} section. For example, to add the v4 @@ -174,7 +174,7 @@ project</a> based on the support library code:</p> <code><sdk>/extras/android/support/v7/appcompat/</code>.</li> <li>Click <strong>Finish</strong> to import the project. For the v7 appcompat project, you should now see a new project titled <em>android-support-v7-appcompat</em>.</li> - <li>In the new library project, expand the {@code /libs} folder, right-click each {@code .jar} + <li>In the new library project, expand the {@code libs/} folder, right-click each {@code .jar} file and select <strong>Build Path > Add to Build Path</strong>. For example, when creating the the v7 appcompat project, add both the {@code android-support-v4.jar} and {@code android-support-v7-appcompat.jar} files to the build path.</li> |