From 89d11705a19f73d32a7e604477dd4358dc04d051 Mon Sep 17 00:00:00 2001 From: "smain@google.com" Date: Sat, 14 May 2016 19:20:00 -0700 Subject: Update links for all files under sdk/ that moved to studio/ Change-Id: I624621dfd7df0f441d0b559e5a12029e5e299964 --- docs/html/about/start.jd | 2 +- docs/html/about/versions/android-1.5.jd | 9 +-------- docs/html/about/versions/android-1.6.jd | 9 +-------- docs/html/about/versions/android-2.0.1.jd | 9 +-------- docs/html/about/versions/android-2.0.jd | 9 +-------- docs/html/about/versions/android-2.1.jd | 9 +-------- docs/html/about/versions/android-2.2.jd | 5 ----- docs/html/about/versions/android-5.0.jd | 2 +- docs/html/about/versions/marshmallow/android-6.0.jd | 2 +- docs/html/google/play/expansion-files.jd | 2 +- docs/html/google/play/licensing/setting-up.jd | 8 +++----- docs/html/guide/practices/optimizing-for-3.0.jd | 7 ++----- docs/html/guide/topics/manifest/uses-feature-element.jd | 2 +- docs/html/guide/topics/resources/localization.jd | 4 +--- docs/html/index.jd | 4 ++-- docs/html/jd_collections.js | 4 ++-- docs/html/legal.jd | 2 +- docs/html/ndk/guides/graphics/getting-started.jd | 2 +- docs/html/ndk/guides/setup.jd | 2 +- docs/html/offline.jd | 2 +- docs/html/preview/overview.jd | 2 +- docs/html/reference/packages-wearable-support.html | 2 +- docs/html/samples/index.jd | 2 +- docs/html/sdk/1.0_r1/installing.jd | 4 ++-- docs/html/sdk/1.0_r2/installing.jd | 4 ++-- docs/html/sdk/1.1_r1/installing.jd | 4 ++-- docs/html/sdk/1.5_r1/installing.jd | 4 ++-- docs/html/sdk/1.5_r2/installing.jd | 4 ++-- docs/html/sdk/1.5_r3/installing.jd | 4 ++-- docs/html/sdk/1.6_r1/installing.jd | 4 ++-- docs/html/sdk/RELEASENOTES.jd | 8 ++++---- docs/html/sdk/download.jd | 4 ++-- docs/html/sdk/older_releases.jd | 6 +++--- docs/html/sitemap.txt | 12 ++++++------ docs/html/topic/libraries/support-library/setup.jd | 2 +- .../html/topic/libraries/testing-support-library/index.jd | 2 +- docs/html/training/auto/messaging/index.jd | 2 +- docs/html/training/auto/start/index.jd | 2 +- docs/html/training/basics/firstapp/creating-project.jd | 11 +++++------ docs/html/training/basics/firstapp/index.jd | 4 ++-- docs/html/training/basics/firstapp/starting-activity.jd | 9 +-------- docs/html/training/custom-views/index.jd | 2 +- docs/html/training/material/compatibility.jd | 2 +- docs/html/training/material/drawables.jd | 2 +- docs/html/training/material/lists-cards.jd | 2 +- docs/html/training/multiple-apks/api.jd | 14 +++----------- docs/html/training/multiple-apks/multiple.jd | 13 +++---------- docs/html/training/multiple-apks/screensize.jd | 15 +++------------ docs/html/training/multiple-apks/texture.jd | 13 +++---------- .../testing/integration-testing/service-testing.jd | 2 +- docs/html/training/testing/ui-testing/espresso-testing.jd | 2 +- docs/html/training/testing/ui-testing/index.jd | 2 +- .../training/testing/ui-testing/uiautomator-testing.jd | 2 +- docs/html/training/tv/start/index.jd | 2 +- docs/html/training/tv/start/start.jd | 8 ++++---- docs/html/training/volley/index.jd | 5 ++--- docs/html/training/wearables/apps/always-on.jd | 2 +- docs/html/training/wearables/apps/creating.jd | 4 ++-- docs/html/training/wearables/apps/layouts.jd | 2 +- docs/html/training/wearables/apps/packaging.jd | 2 +- docs/html/training/wearables/watch-faces/index.jd | 2 +- docs/html/training/wearables/watch-faces/service.jd | 6 +++--- 62 files changed, 104 insertions(+), 191 deletions(-) diff --git a/docs/html/about/start.jd b/docs/html/about/start.jd index 465814138b79..a09c746ce3d7 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 522f855015db..775561bffe8b 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 dc30b4994c0a..ffca6b623406 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 29741529e08b..48f7ae892fa7 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 5c0d3dc92907..329af3cf1d69 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 02dec7e8d40d..ce6f1b20516c 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 bd0f071e55f9..84d5c7453209 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 89560769bfc1..6122a21ce5f6 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 779ecf48c044..240b08020db7 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 6d1de7e75451..3c01684ade50 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 f7521822d9b3..352b79b304a4 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 fea54af80608..135ce42151be 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:
    • SDK Platform Android 3.0
      • @@ -421,7 +418,7 @@ href="{@docRoot}about/versions/android-3.0.html">Android 3.0 Platform docume

      Many of the new features and APIs that are described above and in the Android 3.0 Platform document also have accompanying samples that allow you to preview the effects and can help you understand how to use them. To get -the samples, download them from the SDK repository using the Android SDK Manager. After downloading the samples ("Samples for SDK API 11"), you can find them in <sdk_root>/samples/android-11/. The following list provides links to the browsable source code for some of the samples:

      diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index 5472453c7629..74ab8f2804fa 100755 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -508,7 +508,7 @@ If you are using SDK Tools r8 or higher, you can find aapt in the

      Note: You must use the version of aapt that is provided for the latest Platform-Tools component available. If you do not have the latest Platform-Tools component, download it using the Android SDK Manager. +href="{@docRoot}studio/intro/update.html">Android SDK Manager.

    • Run aapt using this syntax:
diff --git a/docs/html/guide/topics/resources/localization.jd b/docs/html/guide/topics/resources/localization.jd index a31b07cc2ca8..e23de868034f 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 2f67c58412a0..28b8626f8220 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -55,7 +55,7 @@ nonavpage=true