diff options
Diffstat (limited to 'docs/html')
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 <a href="{@docRoot}distribute/index.html">Distribute</a> sectio <h2>Go!</h2> <p>Get started by installing <a -href="{@docRoot}sdk/index.html">Android Studio</a>—the official IDE for Android development, +href="{@docRoot}studio/index.html">Android Studio</a>—the official IDE for Android development, which includes the Android SDK tools. Then when you're ready to begin coding, follow the training for <a href="{@docRoot}training/basics/firstapp/index.html">Building Your First App</a>.</p>
\ 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 »</a> </li> </ol> -<h2>See Also</h2> -<ol> - <li><a href="{@docRoot}sdk/exploring.html">Exploring the SDK</a></li> -</ol> - </div> </div> @@ -54,9 +49,7 @@ compliant and includes no external libraries. </p> <p>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 <a href="{@docRoot}sdk/exploring.html">Exploring the -SDK</a>.</p> +download the platform into your Android 1.6 or later SDK.</p> <h2 id="features">Platform Highlights</h2> 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 »</a> </li> </ol> -<h2>See Also</h2> -<ol> - <li><a href="{@docRoot}sdk/exploring.html">Exploring the SDK</a></li> -</ol> - </div> </div> @@ -55,9 +50,7 @@ and includes no external libraries.</p> <p>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 <a href="{@docRoot}sdk/exploring.html">Exploring the -SDK</a>.</p> +download the latest Android 1.6 platform into your Android 1.6 or later SDK.</p> <h2 id="features">Platform Highlights</h2> 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 »</a> </li> </li> </ol> - <h2>See Also</h2> - <ol> - <li><a href="{@docRoot}sdk/exploring.html">Exploring the SDK</a></li> - </ol> - </div> </div> @@ -56,9 +51,7 @@ includes no external libraries. </p> <p>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 <a href="{@docRoot}sdk/exploring.html">Exploring the -SDK</a>.</p> +download the platform into your Android 1.6 or later SDK.</p> <h2 id="features">Platform Highlights</h2> 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 </ol></li> </ol> - <h2>See Also</h2> - <ol> - <li><a href="{@docRoot}sdk/exploring.html">Exploring the SDK</a></li> - </ol> - </div> </div> @@ -49,9 +44,7 @@ compliant and includes no external libraries. </p> <p>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 <a href="{@docRoot}sdk/exploring.html">Exploring the -SDK</a>.</p> +download the platform into your SDK.</p> <h2 id="features">Platform Highlights</h2> 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 »</a> </li> </ol> -<h2>See Also</h2> -<ol> - <li><a href="{@docRoot}sdk/exploring.html">Exploring the SDK</a></li> -</ol> - </div> </div> @@ -55,9 +50,7 @@ includes no external libraries. </p> <p>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 <a href="{@docRoot}sdk/exploring.html">Exploring the -SDK</a>.</p> +download the platform into your SDK.</p> <h2 id="features">Platform Highlights</h2> 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 »</a> </li> </ol> -<h2>See Also</h2> -<ol> - <li><a href="{@docRoot}sdk/exploring.html">Exploring the SDK</a></li> -</ol> - </div> </div> 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</a>.</p> <h3 id="Start">Start developing</h3> -<p>To start building apps for Android 5.0, you must first <a href="{@docRoot}sdk/index.html">get +<p>To start building apps for Android 5.0, you must first <a href="{@docRoot}studio/index.html">get the Android SDK</a>. Then use the <a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> to download the Android 5.0 SDK Platform and System Images.</p> 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.</p> <h3 id="Start">Start developing</h3> -<p>To start building apps for Android 6.0, you must first <a href="{@docRoot}sdk/index.html">get +<p>To start building apps for Android 6.0, you must first <a href="{@docRoot}studio/index.html">get the Android SDK</a>. Then use the <a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a> to download the Android 6.0 SDK Platform and System Images.</p> 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.</li> download two packages from the SDK Manager and add the appropriate libraries to your application.</p> -<p>First, open the <a href="{@docRoot}sdk/exploring.html">Android SDK Manager</a> +<p>First, open the <a href="{@docRoot}studio/intro/update.html">Android SDK Manager</a> (<strong>Tools > Android > SDK Manager</strong>), and under <em>Appearance & Behavior > System Settings > Android SDK</em>, select the <em>SDK Tools</em> tab to select and download:</p> 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: </p> <code><<em>sdk</em>>/extras/google/market_licensing/sample/</code> (the example application)</p> -<p>If you aren't familiar with how to download packess into your SDK, see the -<a href="{@docRoot}sdk/exploring.html">Exploring the SDK</a> -document. </p> +<p>If you aren't familiar with how to download packages into your SDK, learn how to +<a href="{@docRoot}studio/intro/update.html">update the SDK tools</a>. </p> <h3 id="lvl-setup">Setting Up the Licensing Verification Library</h3> @@ -324,8 +323,7 @@ then select <strong>Next</strong>.</li> </ol> <p>For more information about how to work with library modules in Android Studio, see -<a href="{@docRoot}sdk/installing/create-project.html#SettingUpLibraryModule">Managing Projects from -Android Studio</a>.</p> +<a href="{@docRoot}studio/projects/android-library.html">Create an Android Library</a>.</p> <h4>Copying the LVL sources to your application</h4> 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.</li> <p>To start testing and developing your application on Android 3.0, set up your existing Android SDK with the new platform:</p> -<p>(If you don't have an existing Android SDK, <a href="{@docRoot}sdk/index.html">download the -SDK starter package now</a>.)</p> - <ol> - <li><a href="{@docRoot}sdk/exploring.html#launching">Launch the Android SDK + <li><a href="{@docRoot}studio/intro/update.html#launching">Launch the Android SDK Manager</a> and install the following: <ul> <li>SDK Platform Android 3.0</li> @@ -421,7 +418,7 @@ href="{@docRoot}about/versions/android-3.0.html">Android 3.0 Platform</a> docume <p>Many of the new features and APIs that are described above and in the <a href="{@docRoot}about/versions/android-3.0.html#api">Android 3.0 Platform</a> 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 <a href="{@docRoot}sdk/exploring.html" +the samples, download them from the SDK repository <a href="{@docRoot}studio/intro/update.html" >using the Android SDK Manager</a>. After downloading the samples ("Samples for SDK API 11"), you can find them in <code><sdk_root>/samples/android-11/</code>. The following list provides links to the browsable source code for some of the samples:</p> 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 <code>aapt</code> in the <p class="note"><strong>Note:</strong> You must use the version of <code>aapt</code> that is provided for the latest Platform-Tools component available. If you do not have the latest Platform-Tools component, download it using the <a -href="{@docRoot}sdk/exploring.html">Android SDK Manager</a>. +href="{@docRoot}studio/intro/update.html">Android SDK Manager</a>. </p></li> <li>Run <code>aapt</code> using this syntax: </li> </ol> 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</a>.</p> <h4>Creating and using a custom locale</h4> <p>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 <a -href="{@docRoot}sdk/index.html">SDK</a> 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:</p> 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 </a> <ul class="dac-actions"> <li class="dac-action"> - <a class="dac-action-link" href="{@docRoot}sdk/index.html"> + <a class="dac-action-link" href="{@docRoot}studio/index.html"> <i class="dac-action-sprite dac-sprite dac-auto-chevron-large"></i> Get Android Studio </a> @@ -82,7 +82,7 @@ nonavpage=true <i class="dac-sprite dac-arrow-down-gray"></i> </a> <div class="actions"> - <div><a href="{@docRoot}sdk/index.html"> + <div><a href="{@docRoot}studio/index.html"> <span class="dac-sprite dac-auto-chevron-large"></span> Get Android Studio </a></div> diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js index 57e0f7b6d009..96a210ca56fe 100644 --- a/docs/html/jd_collections.js +++ b/docs/html/jd_collections.js @@ -18,7 +18,7 @@ var RESOURCE_COLLECTIONS = { "resources": [ "training/building-wearables.html", "training/material/index.html", - "sdk/index.html" + "studio/index.html" ] }, "index/secondary/carousel": { @@ -1860,7 +1860,7 @@ var RESOURCE_COLLECTIONS = { "resources": [ "tools/studio/index.html", "tools/studio/studio-features.html", - "sdk/installing/studio-tips.html", + "studio/intro/index.html", ] }, "tools/landing/latest": { diff --git a/docs/html/legal.jd b/docs/html/legal.jd index 0a685082d5d7..8385774a853e 100755 --- a/docs/html/legal.jd +++ b/docs/html/legal.jd @@ -17,7 +17,7 @@ as a development platform pursuant to our commitment to openness, freedom, and i mobile.</p> <p>To start developing apps for Android, <a -href="{@docRoot}sdk/index.html">download the free Android SDK</a>.</p> +href="{@docRoot}studio/index.html">download the free Android SDK</a>.</p> <h2 id="Brands">Android Brands</h2> diff --git a/docs/html/ndk/guides/graphics/getting-started.jd b/docs/html/ndk/guides/graphics/getting-started.jd index c0dd463c9db3..145e534783b1 100644 --- a/docs/html/ndk/guides/graphics/getting-started.jd +++ b/docs/html/ndk/guides/graphics/getting-started.jd @@ -48,7 +48,7 @@ Before getting started, you must download several tools and other software. <ol style="1"> <li>If you don’t already have Android Studio, - <a href="{@docRoot}sdk/index.html">download it.</a></li> + <a href="{@docRoot}studio/index.html">download it.</a></li> <li><a href="https://github.com/android-ndk/ndk/wiki">Download</a> NDK r12-beta.</li> diff --git a/docs/html/ndk/guides/setup.jd b/docs/html/ndk/guides/setup.jd index 81a33c0bebc6..6e53b29b2a7d 100644 --- a/docs/html/ndk/guides/setup.jd +++ b/docs/html/ndk/guides/setup.jd @@ -33,7 +33,7 @@ information on that topic, see the <h2 id="install">Installation</h2> <p>To install and configure the NDK, follow these steps:</p> <ol type="1"> -<li>Get and install the <a href="{@docRoot}sdk/index.html">Android SDK</a>.</li> +<li>Get and install the <a href="{@docRoot}studio/index.html">Android SDK</a>.</li> <li><a href="{@docRoot}ndk/downloads/index.html">Download</a> and <a href="{@docRoot}ndk/downloads/index.html#extract">extract</a> the NDK, making sure to download the correct version for your development platform. You may place the diff --git a/docs/html/offline.jd b/docs/html/offline.jd index 6d4483fd1502..4a1216e2736b 100644 --- a/docs/html/offline.jd +++ b/docs/html/offline.jd @@ -38,7 +38,7 @@ tools</li> <h3>If you've downloaded the Android SDK for the first time</h3> -<p>Follow the guide to <a href="{@docRoot}sdk/installing/index.html">Installing the Android SDK</a>, which +<p>Follow the guide to <a href="{@docRoot}studio/install.html">Installing the Android SDK</a>, which will help you setup your development environment.</p> <h3>If you've installed new SDK components using the Android SDK Manager</h3> diff --git a/docs/html/preview/overview.jd b/docs/html/preview/overview.jd index bd17ee082e3b..0369490de884 100644 --- a/docs/html/preview/overview.jd +++ b/docs/html/preview/overview.jd @@ -218,7 +218,7 @@ page.tags="preview", "developer", "android" <h3 id="sdk_tools">SDK tools</h3> -<p>You can download these components through the SDK Manager in <a href="{@docRoot}sdk/installing/adding-packages.html">Android Studio</a>:</p> +<p>You can download these components through the SDK Manager in <a href="{@docRoot}studio/intro/update.html">Android Studio</a>:</p> <ul> <li> N Developer Preview <strong>SDK and tools</strong> diff --git a/docs/html/reference/packages-wearable-support.html b/docs/html/reference/packages-wearable-support.html index 19a785b6b560..aff2e3477e20 100644 --- a/docs/html/reference/packages-wearable-support.html +++ b/docs/html/reference/packages-wearable-support.html @@ -351,7 +351,7 @@ type="text/css"> es-lang="Referencia">Reference</a> </li> <li class="dac-nav-item tools"> - <a class="dac-nav-link" href="../sdk/index.html" + <a class="dac-nav-link" href="../studio/index.html" zh-tw-lang="相關工具" zh-cn-lang="工具" ru-lang="Инструменты" diff --git a/docs/html/samples/index.jd b/docs/html/samples/index.jd index 267c273c0ed1..76ea573ffbbf 100644 --- a/docs/html/samples/index.jd +++ b/docs/html/samples/index.jd @@ -52,7 +52,7 @@ for your applications.</p> <ol> <li>Unpack the downloaded project package.</li> - <li>In <a href="{@docRoot}sdk/installing/studio.html">Android Studio</a>, chose + <li>In <a href="{@docRoot}studio/index.html">Android Studio</a>, chose <strong>File > Import Project</strong> and select the root folder of the unpacked project. <p>Android Studio may ask you to choose the type of project you are importing. If this is the case, make sure to choose <strong>Import project from diff --git a/docs/html/sdk/1.0_r1/installing.jd b/docs/html/sdk/1.0_r1/installing.jd index 2ea04e468754..38c2a1a32241 100644 --- a/docs/html/sdk/1.0_r1/installing.jd +++ b/docs/html/sdk/1.0_r1/installing.jd @@ -1,8 +1,8 @@ @jd:body <script type="text/javascript"> - document.location=toRoot+"sdk/installing.html" + document.location=toRoot+"studio/index.html" </script> <p>You should have already been redirected by your browser. Please go to -<a href="{@docRoot}sdk/installing.html">Installing the Android SDK</a>.</p>
\ No newline at end of file +<a href="{@docRoot}studio/index.html">Installing the Android SDK</a>.</p>
\ No newline at end of file diff --git a/docs/html/sdk/1.0_r2/installing.jd b/docs/html/sdk/1.0_r2/installing.jd index 2ea04e468754..38c2a1a32241 100644 --- a/docs/html/sdk/1.0_r2/installing.jd +++ b/docs/html/sdk/1.0_r2/installing.jd @@ -1,8 +1,8 @@ @jd:body <script type="text/javascript"> - document.location=toRoot+"sdk/installing.html" + document.location=toRoot+"studio/index.html" </script> <p>You should have already been redirected by your browser. Please go to -<a href="{@docRoot}sdk/installing.html">Installing the Android SDK</a>.</p>
\ No newline at end of file +<a href="{@docRoot}studio/index.html">Installing the Android SDK</a>.</p>
\ No newline at end of file diff --git a/docs/html/sdk/1.1_r1/installing.jd b/docs/html/sdk/1.1_r1/installing.jd index 2ea04e468754..38c2a1a32241 100644 --- a/docs/html/sdk/1.1_r1/installing.jd +++ b/docs/html/sdk/1.1_r1/installing.jd @@ -1,8 +1,8 @@ @jd:body <script type="text/javascript"> - document.location=toRoot+"sdk/installing.html" + document.location=toRoot+"studio/index.html" </script> <p>You should have already been redirected by your browser. Please go to -<a href="{@docRoot}sdk/installing.html">Installing the Android SDK</a>.</p>
\ No newline at end of file +<a href="{@docRoot}studio/index.html">Installing the Android SDK</a>.</p>
\ No newline at end of file diff --git a/docs/html/sdk/1.5_r1/installing.jd b/docs/html/sdk/1.5_r1/installing.jd index 2ea04e468754..38c2a1a32241 100644 --- a/docs/html/sdk/1.5_r1/installing.jd +++ b/docs/html/sdk/1.5_r1/installing.jd @@ -1,8 +1,8 @@ @jd:body <script type="text/javascript"> - document.location=toRoot+"sdk/installing.html" + document.location=toRoot+"studio/index.html" </script> <p>You should have already been redirected by your browser. Please go to -<a href="{@docRoot}sdk/installing.html">Installing the Android SDK</a>.</p>
\ No newline at end of file +<a href="{@docRoot}studio/index.html">Installing the Android SDK</a>.</p>
\ No newline at end of file diff --git a/docs/html/sdk/1.5_r2/installing.jd b/docs/html/sdk/1.5_r2/installing.jd index 2ea04e468754..38c2a1a32241 100644 --- a/docs/html/sdk/1.5_r2/installing.jd +++ b/docs/html/sdk/1.5_r2/installing.jd @@ -1,8 +1,8 @@ @jd:body <script type="text/javascript"> - document.location=toRoot+"sdk/installing.html" + document.location=toRoot+"studio/index.html" </script> <p>You should have already been redirected by your browser. Please go to -<a href="{@docRoot}sdk/installing.html">Installing the Android SDK</a>.</p>
\ No newline at end of file +<a href="{@docRoot}studio/index.html">Installing the Android SDK</a>.</p>
\ No newline at end of file diff --git a/docs/html/sdk/1.5_r3/installing.jd b/docs/html/sdk/1.5_r3/installing.jd index 2ea04e468754..38c2a1a32241 100644 --- a/docs/html/sdk/1.5_r3/installing.jd +++ b/docs/html/sdk/1.5_r3/installing.jd @@ -1,8 +1,8 @@ @jd:body <script type="text/javascript"> - document.location=toRoot+"sdk/installing.html" + document.location=toRoot+"studio/index.html" </script> <p>You should have already been redirected by your browser. Please go to -<a href="{@docRoot}sdk/installing.html">Installing the Android SDK</a>.</p>
\ No newline at end of file +<a href="{@docRoot}studio/index.html">Installing the Android SDK</a>.</p>
\ No newline at end of file diff --git a/docs/html/sdk/1.6_r1/installing.jd b/docs/html/sdk/1.6_r1/installing.jd index 2ea04e468754..38c2a1a32241 100644 --- a/docs/html/sdk/1.6_r1/installing.jd +++ b/docs/html/sdk/1.6_r1/installing.jd @@ -1,8 +1,8 @@ @jd:body <script type="text/javascript"> - document.location=toRoot+"sdk/installing.html" + document.location=toRoot+"studio/index.html" </script> <p>You should have already been redirected by your browser. Please go to -<a href="{@docRoot}sdk/installing.html">Installing the Android SDK</a>.</p>
\ No newline at end of file +<a href="{@docRoot}studio/index.html">Installing the Android SDK</a>.</p>
\ No newline at end of file diff --git a/docs/html/sdk/RELEASENOTES.jd b/docs/html/sdk/RELEASENOTES.jd index d69697ab46ac..8f124a5f9b44 100644 --- a/docs/html/sdk/RELEASENOTES.jd +++ b/docs/html/sdk/RELEASENOTES.jd @@ -45,8 +45,8 @@ href="{@docRoot}tools/sdk/eclipse-adt.html#notes">ADT Plugin for Eclipse</a>.</l </ul> <p>To get started with the SDK, review the Quick Start summary on the <a -href="{@docRoot}sdk/index.html">Android SDK download page</a> or read <a -href="{@docRoot}sdk/installing/index.html">Installing the SDK</a> for detailed +href="{@docRoot}studio/index.html">Android SDK download page</a> or read <a +href="{@docRoot}studio/install.html">Installing the SDK</a> for detailed installation instructions. </p> @@ -204,7 +204,7 @@ to upgrade to the latest version.</p> <p>For driver installation or upgrade instructions, see <a -href="{@docRoot}sdk/win-usb.html">USB Driver for Windows</a>.</p> +href="{@docRoot}studio/run/win-usb.html">USB Driver for Windows</a>.</p> </p> <h3>Emulator Skins, Android 1.6 Platform</h3> @@ -445,7 +445,7 @@ these USB drivers that you can install, to let you develop on the device:</p> <p>For driver installation or upgrade instructions, see <a -href="{@docRoot}sdk/win-usb.html">USB Driver for Windows</a>.</p> +href="{@docRoot}studio/run/win-usb.html">USB Driver for Windows</a>.</p> </p> <h3>Resolved Issues, Changes</h3> diff --git a/docs/html/sdk/download.jd b/docs/html/sdk/download.jd index 52432cf5effa..5152ba3e46f8 100644 --- a/docs/html/sdk/download.jd +++ b/docs/html/sdk/download.jd @@ -34,7 +34,7 @@ The License Agreement constitutes a contract between you and Google with respect SDK.</p> <p class="note"><strong>Note:</strong> You must agree to this license agreement in order to download one of the archived SDKs, because these SDK packages contain Google software (whereas, the -<a href="http://developer.android.com/sdk/index.html">current SDK</a> packages do not require a +<a href="http://developer.android.com/studio/index.html">current SDK</a> packages do not require a license agreement, because they contain only the open sourced SDK tools).</p> <iframe id="terms" style="border:1px solid #888;margin:0 0 1em;height:400px;width:100%;" @@ -72,7 +72,7 @@ download</a>.</p> recommended. We no longer maintain documentation about how to install these archived SDKs nor support the tools contained within.</p> <p>We recommend that you instead download the latest <a -href="http://developer.android.com/sdk/index.html">Android SDK starter package</a>, which includes +href="http://developer.android.com/studio/index.html">Android SDK starter package</a>, which includes the latest SDK tools and allows you to develop against any version of the Android platform, back to Android 1.1.</p> </div> diff --git a/docs/html/sdk/older_releases.jd b/docs/html/sdk/older_releases.jd index 94baa92e4e4e..bb64feb0fbc7 100644 --- a/docs/html/sdk/older_releases.jd +++ b/docs/html/sdk/older_releases.jd @@ -9,14 +9,14 @@ informational and archival purposes only</strong>.</p> <div class="special"> <p>If you are just starting to develop applications for Android, please -download the current <a href="{@docRoot}sdk/index.html">Android +download the current <a href="{@docRoot}studio/index.html">Android SDK</a>. With the current Android SDK, you can add any current and previous version of the Android platform as a component and use it for development and testing.</p> <p>If you already have an Android SDK for platform version 1.6 or newer, then you do not need to install a new SDK—especially not one from this page. You should install older platforms as components of your existing SDK. -See <a href="{@docRoot}sdk/exploring.html">Exploring the SDK</a>.</p> +See <a href="{@docRoot}studio/intro/update.html">Exploring the SDK</a>.</p> </div> @@ -30,7 +30,7 @@ version-neutral Android SDK to download each version of the Android platfrom as an individual component.</p> <p>Please download the current <a -href="http://developer.android.com/sdk/index.html">Android SDK</a>.</p> +href="http://developer.android.com/studio/index.html">Android SDK</a>.</p> <h3>Release 1.6 r1</h3> diff --git a/docs/html/sitemap.txt b/docs/html/sitemap.txt index cd87d1cf189b..d41950af1ec0 100644 --- a/docs/html/sitemap.txt +++ b/docs/html/sitemap.txt @@ -13,7 +13,7 @@ http://developer.android.com/training/index.html http://developer.android.com/guide/components/index.html http://developer.android.com/reference/packages.html http://developer.android.com/tools/index.html -http://developer.android.com/sdk/index.html +http://developer.android.com/studio/index.html http://developer.android.com/google/index.html http://developer.android.com/distribute/googleplay/publish/index.html http://developer.android.com/distribute/googleplay/promote/index.html @@ -79,10 +79,10 @@ http://developer.android.com/downloads/design/Roboto_Hinted_20120823.zip http://developer.android.com/downloads/design/Roboto_Specimen_Book_20111129.pdf http://developer.android.com/downloads/design/Android_Design_Color_Swatches_20120229.zip http://developer.android.com/sdk/installing/bundle.html -http://developer.android.com/sdk/installing/index.html +http://developer.android.com/studio/install.html http://developer.android.com/sdk/installing/installing-adt.html -http://developer.android.com/sdk/installing/adding-packages.html -http://developer.android.com/sdk/exploring.html +http://developer.android.com/studio/intro/update.html +http://developer.android.com/studio/intro/update.html http://developer.android.com/tools/sdk/ndk/index.html http://developer.android.com/tools/workflow/index.html http://developer.android.com/tools/devices/index.html @@ -4183,7 +4183,7 @@ http://developer.android.com/reference/android/support/v4/database/DatabaseUtils http://developer.android.com/reference/org/json/JSONArray.html http://developer.android.com/reference/org/json/JSONStringer.html http://developer.android.com/reference/org/json/JSONTokener.html -http://developer.android.com/sdk/win-usb.html +http://developer.android.com/studio/run/win-usb.html http://developer.android.com/reference/android/media/effect/EffectUpdateListener.html http://developer.android.com/reference/javax/xml/validation/Schema.html http://developer.android.com/reference/android/support/v4/os/ParcelableCompatCreatorCallbacks.html @@ -4958,7 +4958,7 @@ http://developer.android.com/sdk/api_diff/9/changes/java.util.concurrent.TimeUni http://developer.android.com/sdk/api_diff/9/changes/java.security.UnrecoverableKeyException.html http://developer.android.com/sdk/api_diff/3/changes/jdiff_statistics.html http://developer.android.com/reference/android/telephony/cdma/CdmaCellLocation.html -http://developer.android.com/sdk/installing.html +http://developer.android.com/studio/index.html http://developer.android.com/tools/sdk/ndk/overview.html http://developer.android.com/reference/dalvik/system/DexClassLoader.html http://developer.android.com/sdk/api_diff/13/changes/jdiff_topleftframe.html diff --git a/docs/html/topic/libraries/support-library/setup.jd b/docs/html/topic/libraries/support-library/setup.jd index 8fbcee156d32..62f7148acc7c 100755 --- a/docs/html/topic/libraries/support-library/setup.jd +++ b/docs/html/topic/libraries/support-library/setup.jd @@ -216,7 +216,7 @@ android { <p>In this case, the build file setting tells Google Play that the default build variant of your application can be installed on devices with Android 2.2 (API level 8) and higher. For more information about build variants, see - <a href="{@docRoot}sdk/installing/studio-build.html">Build System Overview</a>. </p> + <a href="{@docRoot}studio/build/index.html">Build System Overview</a>. </p> <p class="note"> <strong>Note:</strong> If you are including the v4 support and v7 appcompat libraries in your diff --git a/docs/html/topic/libraries/testing-support-library/index.jd b/docs/html/topic/libraries/testing-support-library/index.jd index 6376e1db1335..ccbbe74a1a9d 100644 --- a/docs/html/topic/libraries/testing-support-library/index.jd +++ b/docs/html/topic/libraries/testing-support-library/index.jd @@ -629,5 +629,5 @@ android { <p> For more information about Android Studio and to download it, see - <a href="{@docRoot}sdk/index.html">Download Android Studio and SDK Tools</a>. + <a href="{@docRoot}studio/index.html">Download Android Studio and SDK Tools</a>. </p> diff --git a/docs/html/training/auto/messaging/index.jd b/docs/html/training/auto/messaging/index.jd index fa8a8c4a7275..0c4c7327ae6e 100644 --- a/docs/html/training/auto/messaging/index.jd +++ b/docs/html/training/auto/messaging/index.jd @@ -280,7 +280,7 @@ User Actions</a>. </p> <p> After you have updated the support libraries, import them into your Android Studio development project by adding this dependency to your - <a href="{@docRoot}sdk/installing/studio-build.html#configBuild">build.gradle</a> file: + <a href="{@docRoot}studio/build/index.html#configBuild">build.gradle</a> file: </p> <pre> diff --git a/docs/html/training/auto/start/index.jd b/docs/html/training/auto/start/index.jd index 202e2c05d86a..b0e747d66e17 100644 --- a/docs/html/training/auto/start/index.jd +++ b/docs/html/training/auto/start/index.jd @@ -63,7 +63,7 @@ communicate with Auto.</p> <p>Before you begin building apps for Auto, you must:</p> <ul> -<li><strong><a href="{@docRoot}sdk/installing/create-project.html">Create or +<li><strong><a href="{@docRoot}studio/projects/create-project.html">Create or update your app project</a></strong> - Android 5.0 (API level 21) provides new APIs for implementing audio playback and messaging that is compatible with Auto. To access the new APIs, create a project or modify an existing project to target diff --git a/docs/html/training/basics/firstapp/creating-project.jd b/docs/html/training/basics/firstapp/creating-project.jd index 57118ce1b791..e66237a2fdfe 100644 --- a/docs/html/training/basics/firstapp/creating-project.jd +++ b/docs/html/training/basics/firstapp/creating-project.jd @@ -37,10 +37,9 @@ app.</p> shows how to create a new project either using Android Studio or using the SDK tools from a command line.</p> -<p class="note"><strong>Note:</strong> You should already have the Android SDK installed, and if -you're using Android Studio, you should also have <a href="{@docRoot}sdk/installing/studio.html"> -Android Studio</a> installed. If you don't have these, follow the guide to <a -href="{@docRoot}sdk/installing/index.html">Installing the Android SDK</a> before you start this +<p class="note"><strong>Note:</strong> You should already have Android Studio or the Android SDK +command-line tools installed. If not, <a +href="{@docRoot}studio/index.html">download them</a> before you start this lesson.</p> @@ -139,7 +138,7 @@ moment to review the most important of these:</p> <li><code>compiledSdkVersion</code> is the platform version against which you will compile your app. By default, this is set to the latest version of Android available in your SDK. (It should be Android 4.1 or greater; if you don't have such a version available, you must - install one using the <a href="{@docRoot}sdk/installing/adding-packages.html">SDK Manager</a>.) + install one using the <a href="{@docRoot}studio/intro/update.html">SDK Manager</a>.) You can still build your app to support older versions, but setting this to the latest version allows you to enable new features and optimize your app for a great user experience on the latest devices.</li> @@ -154,7 +153,7 @@ moment to review the most important of these:</p> <a href="{@docRoot}training/basics/supporting-devices/platforms.html">Supporting Different Platform Versions</a>.</li> </ul> - <p>See <a href="{@docRoot}sdk/installing/studio-build.html">Building Your Project with Gradle</a> + <p>See <a href="{@docRoot}studio/build/index.html">Building Your Project with Gradle</a> for more information about Gradle.</p></dd> </dl> diff --git a/docs/html/training/basics/firstapp/index.jd b/docs/html/training/basics/firstapp/index.jd index 4e3689a3e7b6..cb5073f95c01 100644 --- a/docs/html/training/basics/firstapp/index.jd +++ b/docs/html/training/basics/firstapp/index.jd @@ -15,7 +15,7 @@ helpoutsWidget=true <h2>Dependencies</h2> <ul> - <li><a href="{@docRoot}sdk/index.html">Android Studio</a></li> + <li><a href="{@docRoot}studio/index.html">Android Studio</a></li> </ul> </div> @@ -32,7 +32,7 @@ design, including how to build a simple user interface and handle user input.</p <p>Before you start this class, be sure you have your development environment set up. You need to:</p> <ol> - <li>Download <a href="{@docRoot}sdk/index.html">Android Studio</a>.</li> + <li>Download <a href="{@docRoot}studio/index.html">Android Studio</a>.</li> <li>Download the latest SDK tools and platforms using the <a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a>.</li> </ol> diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd index b67effa3133b..0985e3768436 100644 --- a/docs/html/training/basics/firstapp/starting-activity.jd +++ b/docs/html/training/basics/firstapp/starting-activity.jd @@ -25,13 +25,6 @@ helpoutsWidget=true <li><a href="#DisplayMessage">Display the Message</a></li> </ol> -<h2>You should also read</h2> - -<ul> - <li><a href="{@docRoot}sdk/installing/index.html">Installing the -SDK</a></li> -</ul> - </div> </div> @@ -406,7 +399,7 @@ the <a href="{@docRoot}guide/topics/manifest/meta-data-element.html">{@code <p class="note"><strong>Note:</strong> Your Android SDK should already include the latest Android Support Library, which you installed during the -<a href="{@docRoot}sdk/installing/adding-packages.html">Adding SDK Packages</a> step. +<a href="{@docRoot}studio/intro/update.html">Adding SDK Packages</a> step. When using the templates in Android Studio, the Support Library is automatically added to your app project (you can see the library's JAR file listed under <em>Android Dependencies</em>). If you're not using Android Studio, you need to manually add the library to your project—follow the guide for <a diff --git a/docs/html/training/custom-views/index.jd b/docs/html/training/custom-views/index.jd index f732adbcc453..447da94dd9c8 100755 --- a/docs/html/training/custom-views/index.jd +++ b/docs/html/training/custom-views/index.jd @@ -48,7 +48,7 @@ own views that are robust and reusable.</p> <dl> <dt><b><a href="create-view.html">Creating a View Class</a></b></dt> <dd>Create a class that acts like a built-in view, with custom - attributes and support from the <a href="http://developer.android.com/sdk/installing/studio-layout.html">Android Studio</a> layout editor. + attributes and support from the <a href="http://developer.android.com/studio/write/layout-editor.html">Android Studio</a> layout editor. </dd> <dt><b><a href="custom-drawing.html">Custom Drawing</a></b></dt> diff --git a/docs/html/training/material/compatibility.jd b/docs/html/training/material/compatibility.jd index 49ef7f716256..9ea88b2357b5 100644 --- a/docs/html/training/material/compatibility.jd +++ b/docs/html/training/material/compatibility.jd @@ -127,7 +127,7 @@ the Android v7 Support Library with these limitations:</p> <p>To use these features in versions of Android earlier than 5.0 (API level 21), include the Android v7 Support Library in your project as a <a -href="{@docRoot}/sdk/installing/studio-build.html#dependencies">Gradle dependency</a>:</p> +href="{@docRoot}/studio/build/index.html#dependencies">Gradle dependency</a>:</p> <pre> dependencies { diff --git a/docs/html/training/material/drawables.jd b/docs/html/training/material/drawables.jd index eb9d2734ec81..75911f16b5d8 100644 --- a/docs/html/training/material/drawables.jd +++ b/docs/html/training/material/drawables.jd @@ -70,7 +70,7 @@ provide a listener instead.</p> <code>Palette</code> class, such as <code>Palette.getVibrantColor</code>.</p> <p>To use the {@link android.support.v7.graphics.Palette} class in your project, add the following -<a href="{@docRoot}sdk/installing/studio-build.html#dependencies">Gradle dependency</a> to your +<a href="{@docRoot}studio/build/index.html#dependencies">Gradle dependency</a> to your app's module:</p> <pre> diff --git a/docs/html/training/material/lists-cards.jd b/docs/html/training/material/lists-cards.jd index e7bdfe0ab09a..ee4a56f7cf8a 100644 --- a/docs/html/training/material/lists-cards.jd +++ b/docs/html/training/material/lists-cards.jd @@ -254,7 +254,7 @@ widget in your layout:</p> <p>The {@link android.support.v7.widget.RecyclerView} and {@link android.support.v7.widget.CardView} widgets are part of the <a href="{@docRoot}tools/support-library/features.html#v7">v7 Support Libraries</a>. To use these widgets in your project, add these -<a href="{@docRoot}sdk/installing/studio-build.html#dependencies">Gradle dependencies</a> to your +<a href="{@docRoot}studio/build/index.html#dependencies">Gradle dependencies</a> to your app's module:</p> <pre> diff --git a/docs/html/training/multiple-apks/api.jd b/docs/html/training/multiple-apks/api.jd index 504b4e3ffb00..6647a8c22a01 100755 --- a/docs/html/training/multiple-apks/api.jd +++ b/docs/html/training/multiple-apks/api.jd @@ -149,17 +149,9 @@ color themes, bugs fixed in shared code), which improves your development time a likelihood of mistakes that could have been easily avoided.</p> <p class="note"><strong>Note:</strong> While the implementation details of how to create and -include library projects are beyond the scope of this lesson, you can get up to speed quickly on -their creation at the following links:</p> -<ul> -<li><a -href="{@docRoot}sdk/installing/create-project.html#SettingUpLibraryModule">Managing Projects -from Android Studio</a></li> -<li><a -href="{@docRoot}tools/projects/projects-cmdline.html#SettingUpLibraryProject">Managing Projects -from the Command Line</a></li> -</ul> - +include library projects are beyond the scope of this lesson, you can get up to speed +by reading <a +href="{@docRoot}studio/projects/android-library.html">Create an Android Library</a>.</p> <p>If you’re converting an existing application to use multiple APK support, scour your codebase for every localized string file, list of values, theme diff --git a/docs/html/training/multiple-apks/multiple.jd b/docs/html/training/multiple-apks/multiple.jd index 25015643b54b..c0c2baa97d4d 100755 --- a/docs/html/training/multiple-apks/multiple.jd +++ b/docs/html/training/multiple-apks/multiple.jd @@ -178,16 +178,9 @@ color themes, bugs fixed in shared code), which improves your development time a likelihood of mistakes that could have been easily avoided.</p> <p class="note"><strong>Note:</strong> While the implementation details of how to create and -include library projects are beyond the scope of this lesson, you can get up to speed quickly on -their creation at the following links:</p> -<ul> -<li><a -href="{@docRoot}sdk/installing/create-project.html#SettingUpLibraryModule">Managing Projects -from Android Studio</a></li> -<li><a -href="{@docRoot}tools/projects/projects-cmdline.html#SettingUpLibraryProject">Managing Projects -from the Command Line</a></li> -</ul> +include library projects are beyond the scope of this lesson, you can get up to speed +by reading <a +href="{@docRoot}studio/projects/android-library.html">Create an Android Library</a>.</p> <p>If you’re converting an existing application to use multiple APK support, scour your codebase for every localized string file, list of values, theme diff --git a/docs/html/training/multiple-apks/screensize.jd b/docs/html/training/multiple-apks/screensize.jd index a482f673d2f2..166869196549 100755 --- a/docs/html/training/multiple-apks/screensize.jd +++ b/docs/html/training/multiple-apks/screensize.jd @@ -126,18 +126,9 @@ color themes, bugs fixed in shared code), which improves your development time a likelihood of mistakes that could have been easily avoided.</p> <p class="note"><strong>Note:</strong> While the implementation details of how to create and -include library projects are beyond the scope of this lesson, you can get up to speed quickly on -their creation at the following links:</p> -<ul> -<li><a -href="{@docRoot}sdk/installing/create-project.html#SettingUpLibraryModule">Managing Projects -from Android Studio</a></li> -<li><a -href="{@docRoot}tools/projects/projects-cmdline.html#SettingUpLibraryProject">Managing Projects -from the Command Line</a></li> -</ul> - - +include library projects are beyond the scope of this lesson, you can get up to speed +by reading <a +href="{@docRoot}studio/projects/android-library.html">Create an Android Library</a>.</p> <p>If you’re converting an existing application to use multiple APK support, scour your codebase for every localized string file, list of values, theme diff --git a/docs/html/training/multiple-apks/texture.jd b/docs/html/training/multiple-apks/texture.jd index 3ffd64f05360..ff3c024ffca7 100755 --- a/docs/html/training/multiple-apks/texture.jd +++ b/docs/html/training/multiple-apks/texture.jd @@ -109,16 +109,9 @@ color themes, bugs fixed in shared code), which improves your development time a likelihood of mistakes that could have been easily avoided.</p> <p class="note"><strong>Note:</strong> While the implementation details of how to create and -include library projects are beyond the scope of this lesson, you can get up to speed quickly on -their creation at the following links:</p> -<ul> -<li><a -href="{@docRoot}sdk/installing/create-project.html#SettingUpLibraryModule">Managing Projects -from Android Studio</a></li> -<li><a -href="{@docRoot}tools/projects/projects-cmdline.html#SettingUpLibraryProject">Managing Projects -from the Command Line</a></li> -</ul> +include library projects are beyond the scope of this lesson, you can get up to speed +by reading <a +href="{@docRoot}studio/projects/android-library.html">Create an Android Library</a>.</p> <p>If you’re converting an existing application to use multiple APK support, scour your codebase for every localized string file, list of values, theme diff --git a/docs/html/training/testing/integration-testing/service-testing.jd b/docs/html/training/testing/integration-testing/service-testing.jd index 7b420acede05..60b95ca08a6b 100644 --- a/docs/html/training/testing/integration-testing/service-testing.jd +++ b/docs/html/training/testing/integration-testing/service-testing.jd @@ -128,7 +128,7 @@ public void testWithBoundService() throws TimeoutException { <h2 id="run">Run Integration Tests for Services</h2> <p> -You can run integration tests from <a href="{@docRoot}sdk/index.html">Android Studio</a> or +You can run integration tests from <a href="{@docRoot}studio/index.html">Android Studio</a> or from the command-line. Make sure to specify <a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html"> {@code AndroidJUnitRunner}</a> as the default instrumentation runner in your project. diff --git a/docs/html/training/testing/ui-testing/espresso-testing.jd b/docs/html/training/testing/ui-testing/espresso-testing.jd index 45a4ceba279b..7df67e7c23b8 100644 --- a/docs/html/training/testing/ui-testing/espresso-testing.jd +++ b/docs/html/training/testing/ui-testing/espresso-testing.jd @@ -582,7 +582,7 @@ public void testChangeText_sameActivity() { <h2 id="run">Run Espresso Tests on a Device or Emulator</h2> <p> -You can run Espresso tests from <a href="{@docRoot}sdk/index.html">Android Studio</a> or +You can run Espresso tests from <a href="{@docRoot}studio/index.html">Android Studio</a> or from the command-line. Make sure to specify <a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html"> {@code AndroidJUnitRunner}</a> as the default instrumentation runner in your project. diff --git a/docs/html/training/testing/ui-testing/index.jd b/docs/html/training/testing/ui-testing/index.jd index 1aa95a412f7e..20ec99e9587c 100644 --- a/docs/html/training/testing/ui-testing/index.jd +++ b/docs/html/training/testing/ui-testing/index.jd @@ -32,7 +32,7 @@ tests such that user actions are performed in an automated way. The automated ap you to run your tests quickly and reliably in a repeatable manner.</p> <p class="note"><strong>Note: </strong>It is strongly encouraged that you use -<a href="{@docRoot}sdk/installing/studio.html">Android Studio</a> for +<a href="{@docRoot}studio/index.html">Android Studio</a> for building your test apps, because it provides project setup, library inclusion, and packaging conveniences. This class assumes you are using Android Studio.</p> diff --git a/docs/html/training/testing/ui-testing/uiautomator-testing.jd b/docs/html/training/testing/ui-testing/uiautomator-testing.jd index 5dca40b81afa..db9f14b9b2da 100644 --- a/docs/html/training/testing/ui-testing/uiautomator-testing.jd +++ b/docs/html/training/testing/ui-testing/uiautomator-testing.jd @@ -512,7 +512,7 @@ public void testTwoPlusThreeEqualsFive() { <h2 id="run">Run UI Automator Tests on a Device or Emulator</h2> <p> -You can run UI Automator tests from <a href="{@docRoot}sdk/index.html">Android Studio</a> or +You can run UI Automator tests from <a href="{@docRoot}studio/index.html">Android Studio</a> or from the command-line. Make sure to specify <a href="{@docRoot}reference/android/support/test/runner/AndroidJUnitRunner.html"> {@code AndroidJUnitRunner}</a> as the default instrumentation runner in your project. diff --git a/docs/html/training/tv/start/index.jd b/docs/html/training/tv/start/index.jd index cbd9b493dce2..fcdaa10a626a 100644 --- a/docs/html/training/tv/start/index.jd +++ b/docs/html/training/tv/start/index.jd @@ -37,7 +37,7 @@ startpage=true <p class="note"> <strong>Note:</strong> You are encouraged to use <a href= - "{@docRoot}sdk/installing/studio.html">Android Studio</a> for building TV apps, because it + "{@docRoot}studio/index.html">Android Studio</a> for building TV apps, because it provides project setup, library inclusion, and packaging conveniences. This training assumes you are using Android Studio. </p> diff --git a/docs/html/training/tv/start/start.jd b/docs/html/training/tv/start/start.jd index 492cec828068..97668398e22c 100755 --- a/docs/html/training/tv/start/start.jd +++ b/docs/html/training/tv/start/start.jd @@ -77,17 +77,17 @@ supported by Android TV.</p> <p>Before you begin building apps for TV, you must:</p> <ul> - <li><strong><a href="{@docRoot}sdk/installing/adding-packages.html#GetTools"> + <li><strong><a href="{@docRoot}studio/intro/update.html#GetTools"> Update your SDK tools to version 24.0.0 or higher</a></strong> <br> The updated SDK tools enable you to build and test apps for TV. </li> - <li><strong><a href="{@docRoot}sdk/installing/adding-packages.html#GetTools"> + <li><strong><a href="{@docRoot}studio/intro/update.html#GetTools"> Update your SDK with Android 5.0 (API 21) or higher</a></strong> <br> The updated platform version provides new APIs for TV apps. </li> - <li><strong><a href="{@docRoot}sdk/installing/create-project.html"> + <li><strong><a href="{@docRoot}studio/projects/create-project.html"> Create or update your app project</a></strong> <br> In order to access new APIs for TV devices, you must create a project or modify an existing @@ -364,6 +364,6 @@ supported by Android TV.</p> <p> For more information about using emulators see, <a href="{@docRoot}tools/devices/emulator.html"> Using the Emulator</a>. For more information on deploying apps from Android Studio to virtual - devices, see <a href="{@docRoot}sdk/installing/studio-debug.html">Debugging with Android + devices, see <a href="{@docRoot}studio/debug/index.html">Debugging with Android Studio</a>. </p> diff --git a/docs/html/training/volley/index.jd b/docs/html/training/volley/index.jd index 6ee7d4e0ab9f..22f92721295b 100755 --- a/docs/html/training/volley/index.jd +++ b/docs/html/training/volley/index.jd @@ -78,9 +78,8 @@ git clone https://android.googlesource.com/platform/frameworks/volley </li> <li>Import the downloaded source into your app project as an Android library module -(as described in <a href="{@docRoot}sdk/installing/create-project.html#SettingUpLibraryModule"> -Managing Projects from Android Studio</a>, if you're using Android Studio) or make a -<a href="{@docRoot}guide/faq/commontasks.html#addexternallibrary"><code>.jar</code> file</a>.</li> +as described in <a +href="{@docRoot}studio/projects/android-library.html">Create an Android Library</a>.</li> </ol> <h2>Lessons</h2> diff --git a/docs/html/training/wearables/apps/always-on.jd b/docs/html/training/wearables/apps/always-on.jd index 9f28b709473f..7f63ee4bcbb3 100644 --- a/docs/html/training/wearables/apps/always-on.jd +++ b/docs/html/training/wearables/apps/always-on.jd @@ -62,7 +62,7 @@ your development project. Follow these steps to make the necessary changes:</p> <li>Update your SDK to include the Android 5.1 (API 22) or higher platform, which provides the APIs to allow activities to go into ambient mode. For more information on how to update your SDK, see - <a href="{@docRoot}sdk/installing/adding-packages.html#GetTools">Adding SDK Packages</a>. + <a href="{@docRoot}studio/intro/update.html#GetTools">Adding SDK Packages</a>. </li> <li> Create a project or modify an existing project to target Android 5.1 or higher. This means you must set the manifest diff --git a/docs/html/training/wearables/apps/creating.jd b/docs/html/training/wearables/apps/creating.jd index db91b672abd6..143742348f0e 100644 --- a/docs/html/training/wearables/apps/creating.jd +++ b/docs/html/training/wearables/apps/creating.jd @@ -49,7 +49,7 @@ both your wearable and handheld apps. </ul> <p>To update your SDK with these components, see -<a href="{@docRoot}sdk/installing/adding-packages.html#GetTools"> Get the latest SDK tools</a>.</p> +<a href="{@docRoot}studio/intro/update.html#GetTools"> Get the latest SDK tools</a>.</p> <p class="note"><strong>Note:</strong> If you plan to make your Wear apps available for China, you must use the special release version 7.8.87 of the Google Play services client library to handle @@ -139,7 +139,7 @@ wearable. The wearable should also be listed when you run the <code>adb devices< <p>To begin development, create an app project that contains wearable and handheld app modules. In Android Studio, click <b>File</b> > <b>New Project</b> and follow the Project Wizard instructions, as described in - <a href="{@docRoot}sdk/installing/create-project.html">Creating a + <a href="{@docRoot}studio/projects/create-project.html">Creating a Project</a>. As you follow the wizard, enter the following information:</p> <ol> diff --git a/docs/html/training/wearables/apps/layouts.jd b/docs/html/training/wearables/apps/layouts.jd index 6480e63f093b..a5f3480cccf6 100755 --- a/docs/html/training/wearables/apps/layouts.jd +++ b/docs/html/training/wearables/apps/layouts.jd @@ -200,5 +200,5 @@ dependencies { reference documentation</a> for the classes above.</p> <p class="note"><strong>Note:</strong> We recommend using <a -href="{@docRoot}sdk/index.html">Android Studio</a> for Android Wear development, as +href="{@docRoot}studio/index.html">Android Studio</a> for Android Wear development, as it provides project setup, library inclusion, and packaging conveniences.</p> diff --git a/docs/html/training/wearables/apps/packaging.jd b/docs/html/training/wearables/apps/packaging.jd index 9c42978bd33b..c342b46aa356 100644 --- a/docs/html/training/wearables/apps/packaging.jd +++ b/docs/html/training/wearables/apps/packaging.jd @@ -54,7 +54,7 @@ dependencies { handheld app with the wearable app embedded in it automatically into your project's root folder. <p>Alternatively, you can sign both apps from the command line using the - <a href="{@docRoot}sdk/installing/studio-build.html#gradleWrapper">Gradle wrapper</a>. Both apps + <a href="{@docRoot}studio/build/index.html#gradleWrapper">Gradle wrapper</a>. Both apps must be signed to have the automatic pushing of the wearable app work.</p> <p>Store your key file location and credentials in environment variables and run the Gradle diff --git a/docs/html/training/wearables/watch-faces/index.jd b/docs/html/training/wearables/watch-faces/index.jd index aac49d38ce69..94719fd8424e 100755 --- a/docs/html/training/wearables/watch-faces/index.jd +++ b/docs/html/training/wearables/watch-faces/index.jd @@ -45,7 +45,7 @@ app. This class also covers design considerations and implementation tips to ens designs integrate with system UI elements and are power-efficient.</p> <p class="note"><strong>Note:</strong> We recommend using <a -href="{@docRoot}sdk/index.html">Android Studio</a> for Android Wear development, as +href="{@docRoot}studio/index.html">Android Studio</a> for Android Wear development, as it provides project setup, library inclusion, and packaging conveniences. This training assumes you are using Android Studio.</p> diff --git a/docs/html/training/wearables/watch-faces/service.jd b/docs/html/training/wearables/watch-faces/service.jd index 4246f600902e..20eb0c777e0c 100755 --- a/docs/html/training/wearables/watch-faces/service.jd +++ b/docs/html/training/wearables/watch-faces/service.jd @@ -64,7 +64,7 @@ to implement the watch face service.</p> </ol> <p>Android Studio creates a project with the <code>wear</code> and <code>mobile</code> modules. -For more information, see <a href="{@docRoot}sdk/installing/create-project.html">Creating a +For more information, see <a href="{@docRoot}studio/projects/create-project.html">Creating a Project</a>.</p> <h3 id="Dependencies">Dependencies</h3> @@ -88,7 +88,7 @@ implement watch faces. Browse the documentation</a> for the Wearable Support Library.</p> <p class="note"><strong>Note:</strong> We recommend using <a -href="{@docRoot}sdk/index.html">Android Studio</a> for Android Wear development, as +href="{@docRoot}studio/index.html">Android Studio</a> for Android Wear development, as it provides project setup, library inclusion, and packaging conveniences.</p> <h3 id="Permissions">Declare Permissions</h3> @@ -243,7 +243,7 @@ Wear companion app</a> and the watch face picker on the wearable device use the defined by the <code>com.google.android.wearable.watchface.preview</code> metadata entry when presenting users with all the watch faces installed on the device. To obtain this drawable, run the watch face on your Android Wear device or in an emulator instance and <a -href="{@docRoot}sdk/installing/studio-debug.html#screenCap">take a screenshot</a>. On Android Wear +href="{@docRoot}studio/debug/am-screenshot.html">take a screenshot</a>. On Android Wear devices with hdpi screens, the preview image is typically 320x320 pixels in size.</p> <p>Watch faces that look substantially different on round devices can provide both round and |