Merge "docs: Made javadoc references less ambiguous" into mnc-docs
diff --git a/docs/html/sdk/installing/studio-build.jd b/docs/html/sdk/installing/studio-build.jd
old mode 100644
new mode 100755
index b68b176..54691bf
--- a/docs/html/sdk/installing/studio-build.jd
+++ b/docs/html/sdk/installing/studio-build.jd
@@ -13,7 +13,6 @@
<li><a href="{@docRoot}sdk/installing/studio.html">
Getting Started with Android Studio</a></li>
<li><a href="{@docRoot}tools/studio/index.html">Android Studio Basics</a></li>
- <li><a href="{@docRoot}sdk/installing/migrate.html">Migrating from Eclipse</a></li>
</div>
</div>
diff --git a/docs/html/tools/revisions/build-tools.jd b/docs/html/tools/revisions/build-tools.jd
old mode 100644
new mode 100755
index cccf2e4..2202649
--- a/docs/html/tools/revisions/build-tools.jd
+++ b/docs/html/tools/revisions/build-tools.jd
@@ -26,31 +26,7 @@
<p>To use a specific version of the Build Tools in your application project:</p>
-<div class="toggle-content closed">
-<p style="margin-top:5px"><a href="#" onclick="return toggleContent(this)">
- <img src="/assets/images/triangle-closed.png" class="toggle-content-img" alt=""
- />Using Eclipse</a></p>
- <div class="toggle-content-toggleme">
- <ol>
- <li>In the root folder of your application project, find the {@code project.properties}
- file.</li>
- <li>Open the file and specify the Build Tools version by adding a {@code buildtools} property
- on a separate line:
-<pre>
-sdk.buildtools=17.0.0
-</pre>
- </li>
- </ol>
- </div>
-</div>
-
-<div class="toggle-content closed">
-<p style="margin-top:5px"><a href="#" onclick="return toggleContent(this)">
- <img src="/assets/images/triangle-closed.png" class="toggle-content-img" alt=""
- />Using Android Studio</a></p>
-
- <div class="toggle-content-toggleme">
<ol>
<li>In the root folder of your application project, find the {@code build.gradle}
file.</li>
@@ -65,8 +41,6 @@
</pre>
</li>
</ol>
- </div>
-</div>
<h2 id="notes">Revisions</h2>
diff --git a/docs/html/tools/support-library/setup.jd b/docs/html/tools/support-library/setup.jd
old mode 100644
new mode 100755
index 8112071..8fbcee1
--- a/docs/html/tools/support-library/setup.jd
+++ b/docs/html/tools/support-library/setup.jd
@@ -104,31 +104,6 @@
<p>To add a Support Library without resources to your application project:</p>
-<div class="toggle-content closed">
-<p style="margin-top:5px"><a href="#" onclick="return toggleContent(this)">
- <img src="/assets/images/triangle-closed.png" class="toggle-content-img" alt=""
- />Using Eclipse</a></p>
-
- <div class="toggle-content-toggleme">
- <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>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.
- <li>Right click the JAR file and select <strong>Build Path > Add to Build Path</strong>.
- </li>
- </ol>
- </div>
-</div>
-
-<div class="toggle-content closed">
-<p style="margin-top:5px"><a href="#" onclick="return toggleContent(this)">
- <img src="/assets/images/triangle-closed.png" class="toggle-content-img" alt=""
- />Using Android Studio</a></p>
-
- <div class="toggle-content-toggleme">
<ol>
<li>Make sure you have downloaded the <strong>Android Support Repository</strong>
using the <a href="#download">SDK Manager</a>.</li>
@@ -143,8 +118,6 @@
</pre>
</li>
</ol>
- </div>
-</div>
<h3 id="libs-with-res">Adding libraries with resources</h3>
@@ -153,77 +126,6 @@
<a href="{@docRoot}tools/support-library/features.html#v7-appcompat">v7
appcompat</a> for action bar) to your application project:</p>
-<div class="toggle-content closed">
- <p style="margin-top:5px"><a href="#" onclick="return toggleContent(this)">
- <img src="/assets/images/triangle-closed.png" class="toggle-content-img" alt=""
- />Using Eclipse</a></p>
- <div class="toggle-content-toggleme">
-
-<p>Create a <a href="{@docRoot}tools/projects/index.html#LibraryProjects">library
-project</a> based on the support library code:</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 library project and ensure the required JAR files are included in the project's
- build path:
- <ol>
- <li>Select <strong>File > Import</strong>.</li>
- <li>Select <strong>Existing Android Code Into Workspace</strong> and click
- <strong>Next</strong>.</li>
- <li>Browse to the SDK installation directory and then to the Support Library folder.
- For example, if you are adding the {@code appcompat} project, browse to
- <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}
- 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>
- <li>Right-click the library project folder and select <strong>Build Path > Configure
- Build Path</strong>.</li>
- <li>In the <strong>Order and Export</strong> tab, check the <code>.jar</code> files you just
- added to the build path, so they are available to projects that depend on this library
- project. For example, the {@code appcompat} project requires you to export both the
- {@code android-support-v4.jar} and {@code android-support-v7-appcompat.jar} files.</li>
- <li>Uncheck <strong>Android Dependencies</strong>.</li>
- <li>Click <strong>OK</strong> to complete the changes.</li>
- </ol>
- </li>
-</ol>
-
-<p>You now have a library project for your selected Support Library that you can use with one or
- more application projects.</p>
-
-<p>Add the library to your application project:</p>
- <ol>
- <li>In the Project Explorer, right-click your project and select <strong>Properties</strong>.</li>
- <li>In the category panel on the left side of the dialog, select <strong>Android</strong>.</li>
- <li>In the Library pane, click the <strong>Add</strong> button.</li>
- <li>Select the library project and click <strong>OK</strong>. For example, the
- {@code appcompat} project should be listed as <strong>android-support-v7-appcompat</strong>.
- </li>
- <li>In the properties window, click <strong>OK</strong>.</li>
- </ol>
-
-<p class="note">
- <strong>Note:</strong> If you are using the {@code android-support-v7-mediarouter} support
- library, you should note that it depends on the {@code android-support-v7-appcompat} library.
- In order for the v7 mediarouter library to compile, you must import both library projects into
- your development workspace. Then follow the procedure above to add the v7 appcompat project as a
- library to the v7 mediarouter library project.
-</p>
-
- </div>
-</div>
-
-
-<div class="toggle-content closed">
-<p style="margin-top:5px"><a href="#" onclick="return toggleContent(this)">
- <img src="/assets/images/triangle-closed.png" class="toggle-content-img" alt=""
- />Using Android Studio</a></p>
-
- <div class="toggle-content-toggleme">
<ol>
<li>Make sure you have downloaded the <strong>Android Support Repository</strong>
using the <a href="#download">SDK Manager</a>.</li>
@@ -240,8 +142,6 @@
</pre>
</li>
</ol>
- </div>
-</div>
<h2 id="using-apis">Using Support Library APIs</h2>