diff --git a/docs/html/about/start.jd b/docs/html/about/start.jd index 465814138b797..a09c746ce3d75 100644 --- a/docs/html/about/start.jd +++ b/docs/html/about/start.jd @@ -64,6 +64,6 @@ available in the Distribute sectio

Go!

Get started by installing Android Studio—the official IDE for Android development, +href="{@docRoot}studio/index.html">Android Studio—the official IDE for Android development, which includes the Android SDK tools. Then when you're ready to begin coding, follow the training for Building Your First App.

\ No newline at end of file diff --git a/docs/html/about/versions/android-1.5.jd b/docs/html/about/versions/android-1.5.jd index 522f855015db6..775561bffe8b0 100644 --- a/docs/html/about/versions/android-1.5.jd +++ b/docs/html/about/versions/android-1.5.jd @@ -30,11 +30,6 @@ href="{@docRoot}sdk/api_diff/{@sdkPlatformApiLevel}/changes.html">API Differences Report » -

See Also

-
    -
  1. Exploring the SDK
    2. -
- @@ -54,9 +49,7 @@ compliant and includes no external libraries.

To get started developing or testing against the Android {@sdkPlatformVersion} platform, use the Android SDK and AVD Manager tool to -download the platform into your Android 1.6 or later SDK. For more information, -see Exploring the -SDK.

+download the platform into your Android 1.6 or later SDK.

Platform Highlights

diff --git a/docs/html/about/versions/android-1.6.jd b/docs/html/about/versions/android-1.6.jd index dc30b4994c0aa..ffca6b6234061 100755 --- a/docs/html/about/versions/android-1.6.jd +++ b/docs/html/about/versions/android-1.6.jd @@ -30,11 +30,6 @@ href="{@docRoot}sdk/api_diff/{@sdkPlatformApiLevel}/changes.html">API Differences Report » -

See Also

-
    -
  1. Exploring the SDK
    2. -
- @@ -55,9 +50,7 @@ and includes no external libraries.

To get started developing or testing against the Android {@sdkPlatformVersion} platform, use the Android SDK and AVD Manager tool to -download the latest Android 1.6 platform into your Android 1.6 or later SDK. For -more information, see Exploring the -SDK.

+download the latest Android 1.6 platform into your Android 1.6 or later SDK.

Platform Highlights

diff --git a/docs/html/about/versions/android-2.0.1.jd b/docs/html/about/versions/android-2.0.1.jd index 29741529e08b9..48f7ae892fa73 100644 --- a/docs/html/about/versions/android-2.0.1.jd +++ b/docs/html/about/versions/android-2.0.1.jd @@ -30,11 +30,6 @@ differences report » -

See Also

-
    -
  1. Exploring the SDK
    2. -
- @@ -56,9 +51,7 @@ includes no external libraries.

To get started developing or testing against the Android {@sdkPlatformVersion} platform, use the Android SDK and AVD Manager tool to -download the platform into your Android 1.6 or later SDK. For more information, -see Exploring the -SDK.

+download the platform into your Android 1.6 or later SDK.

Platform Highlights

diff --git a/docs/html/about/versions/android-2.0.jd b/docs/html/about/versions/android-2.0.jd index 5c0d3dc929079..329af3cf1d693 100644 --- a/docs/html/about/versions/android-2.0.jd +++ b/docs/html/about/versions/android-2.0.jd @@ -25,11 +25,6 @@ sdk.platform.majorMinor=major -

See Also

-
    -
  1. Exploring the SDK
    2. -
- @@ -49,9 +44,7 @@ compliant and includes no external libraries.

To get started developing or testing against the Android {@sdkPlatformVersion} platform, use the Android SDK and AVD Manager tool to -download the platform into your SDK. For more information, -see Exploring the -SDK.

+download the platform into your SDK.

Platform Highlights

diff --git a/docs/html/about/versions/android-2.1.jd b/docs/html/about/versions/android-2.1.jd index 02dec7e8d40d7..ce6f1b20516c7 100644 --- a/docs/html/about/versions/android-2.1.jd +++ b/docs/html/about/versions/android-2.1.jd @@ -30,11 +30,6 @@ href="{@docRoot}sdk/api_diff/{@sdkPlatformApiLevel}/changes.html">API Differences Report » -

See Also

-
    -
  1. Exploring the SDK
    2. -
- @@ -55,9 +50,7 @@ includes no external libraries.

To get started developing or testing against the Android {@sdkPlatformVersion} platform, use the Android SDK and AVD Manager tool to -download the platform into your SDK. For more information, -see Exploring the -SDK.

+download the platform into your SDK.

Platform Highlights

diff --git a/docs/html/about/versions/android-2.2.jd b/docs/html/about/versions/android-2.2.jd index bd0f071e55f90..84d5c74532097 100644 --- a/docs/html/about/versions/android-2.2.jd +++ b/docs/html/about/versions/android-2.2.jd @@ -26,11 +26,6 @@ href="{@docRoot}sdk/api_diff/{@sdkPlatformApiLevel}/changes.html">API Differences Report » -

See Also

-
    -
  1. Exploring the SDK
    2. -
- diff --git a/docs/html/about/versions/android-5.0.jd b/docs/html/about/versions/android-5.0.jd index 1bdd2d6f040f8..b77df1797989e 100644 --- a/docs/html/about/versions/android-5.0.jd +++ b/docs/html/about/versions/android-5.0.jd @@ -136,7 +136,7 @@ highlights.

Start developing

-

To start building apps for Android 5.0, you must first get +

To start building apps for Android 5.0, you must first get the Android SDK. Then use the SDK Manager to download the Android 5.0 SDK Platform and System Images.

diff --git a/docs/html/about/versions/marshmallow/android-6.0.jd b/docs/html/about/versions/marshmallow/android-6.0.jd index 779ecf48c044b..240b08020db74 100644 --- a/docs/html/about/versions/marshmallow/android-6.0.jd +++ b/docs/html/about/versions/marshmallow/android-6.0.jd @@ -56,7 +56,7 @@ most notable APIs.

Start developing

-

To start building apps for Android 6.0, you must first get +

To start building apps for Android 6.0, you must first get the Android SDK. Then use the SDK Manager to download the Android 6.0 SDK Platform and System Images.

diff --git a/docs/html/google/play/expansion-files.jd b/docs/html/google/play/expansion-files.jd index 6d1de7e75451a..3c01684ade50a 100755 --- a/docs/html/google/play/expansion-files.jd +++ b/docs/html/google/play/expansion-files.jd @@ -450,7 +450,7 @@ receives updates about the download progress. download two packages from the SDK Manager and add the appropriate libraries to your application.

-

First, open the Android SDK Manager +

First, open the Android SDK Manager (Tools > Android > SDK Manager), and under Appearance & Behavior > System Settings > Android SDK, select the SDK Tools tab to select and download:

diff --git a/docs/html/google/play/licensing/setting-up.jd b/docs/html/google/play/licensing/setting-up.jd index f7521822d9b38..352b79b304a4d 100755 --- a/docs/html/google/play/licensing/setting-up.jd +++ b/docs/html/google/play/licensing/setting-up.jd @@ -250,9 +250,8 @@ the LVL library project and the example application into these directories:

<sdk>/extras/google/market_licensing/sample/  (the example application)

-

If you aren't familiar with how to download packess into your SDK, see the -Exploring the SDK -document.

+

If you aren't familiar with how to download packages into your SDK, learn how to +update the SDK tools.

Setting Up the Licensing Verification Library

@@ -324,8 +323,7 @@ then select Next.

For more information about how to work with library modules in Android Studio, see -Managing Projects from -Android Studio.

+Create an Android Library.

Copying the LVL sources to your application

diff --git a/docs/html/guide/practices/optimizing-for-3.0.jd b/docs/html/guide/practices/optimizing-for-3.0.jd index 4f3d0f2d6760d..8d07eb9847d83 100644 --- a/docs/html/guide/practices/optimizing-for-3.0.jd +++ b/docs/html/guide/practices/optimizing-for-3.0.jd @@ -105,11 +105,8 @@ for tablets and similar devices.

To start testing and developing your application on Android 3.0, set up your existing Android SDK with the new platform:

-

(If you don't have an existing Android SDK, download the -SDK starter package now.)

-
    -
  1. Launch the Android SDK +
  2. Launch the Android SDK Manager and install the following:
diff --git a/docs/html/guide/topics/resources/localization.jd b/docs/html/guide/topics/resources/localization.jd index a31b07cc2ca80..e23de868034ff 100755 --- a/docs/html/guide/topics/resources/localization.jd +++ b/docs/html/guide/topics/resources/localization.jd @@ -429,9 +429,7 @@ href="{@docRoot}tools/help/emulator.html">Android Emulator.

Creating and using a custom locale

A "custom" locale is a language/region combination that the Android -system image does not explicitly support. (For a list of supported locales in -Android platforms see the Version Notes in the SDK tab). You can test +system image does not explicitly support. You can test how your application will run in a custom locale by creating a custom locale in the emulator. There are two ways to do this:

diff --git a/docs/html/index.jd b/docs/html/index.jd index 2f67c58412a0e..28b8626f8220e 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -55,7 +55,7 @@ nonavpage=true