summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorLuan Nguyen <luann@google.com>2015-05-20 23:09:46 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-05-20 23:09:46 +0000
commit6d592518b863e5cbdb6542003377f4e2bf254be2 (patch)
treedc45e590cafff210e3bfa33925fd7c04beee34ca /docs
parent2801c77ef3f76092ae4ef8b1888bc26399ba9188 (diff)
parent8b959ee95b4dfa191c6924b3c88fad72b700d81c (diff)
downloadframeworks_base-6d592518b863e5cbdb6542003377f4e2bf254be2.zip
frameworks_base-6d592518b863e5cbdb6542003377f4e2bf254be2.tar.gz
frameworks_base-6d592518b863e5cbdb6542003377f4e2bf254be2.tar.bz2
am 8b959ee9: Merge "docs: Remove references to Android Studio 0.8 beta" into lmp-mr1-ub-docs
* commit '8b959ee95b4dfa191c6924b3c88fad72b700d81c': docs: Remove references to Android Studio 0.8 beta
Diffstat (limited to 'docs')
-rw-r--r--docs/html/training/material/index.jd1
-rw-r--r--docs/html/training/tv/start/index.jd1
-rw-r--r--docs/html/training/wearables/apps/creating.jd4
-rw-r--r--docs/html/training/wearables/ui/index.jd2
-rw-r--r--docs/html/training/wearables/watch-faces/index.jd1
5 files changed, 1 insertions, 8 deletions
diff --git a/docs/html/training/material/index.jd b/docs/html/training/material/index.jd
index 6071fb1..6e07860 100644
--- a/docs/html/training/material/index.jd
+++ b/docs/html/training/material/index.jd
@@ -11,7 +11,6 @@ page.metaDescription=Learn how to apply material design to your apps.
<h2>Dependencies and Prerequisites</h2>
<ul>
<li>Android 5.0 (API level 21)</li>
- <li>Android Studio 0.8</li>
</ul>
</div>
</div>
diff --git a/docs/html/training/tv/start/index.jd b/docs/html/training/tv/start/index.jd
index 54ff2d9..5426ad7 100644
--- a/docs/html/training/tv/start/index.jd
+++ b/docs/html/training/tv/start/index.jd
@@ -10,7 +10,6 @@ startpage=true
<h2>Dependencies and Prerequisites</h2>
<ul>
<li>Android 5.0 (API level 21) or higher</li>
- <li>Android Studio 0.8 or later and Gradle 0.12 or later</li>
</ul>
</div>
</div>
diff --git a/docs/html/training/wearables/apps/creating.jd b/docs/html/training/wearables/apps/creating.jd
index 487615b..a8b5ec6 100644
--- a/docs/html/training/wearables/apps/creating.jd
+++ b/docs/html/training/wearables/apps/creating.jd
@@ -14,10 +14,6 @@ helpoutsWidget=true
<li><a href="#CreateProject">Create a Project</a></li>
<li><a href="#Libraries">Include the Correct Libraries</a></li>
</ol>
-<h2>Dependencies and Prerequisites</h2>
- <ul>
- <li>Android Studio 0.8.12 or later and Gradle 0.12 or later</li>
- </ul>
</div>
</div>
diff --git a/docs/html/training/wearables/ui/index.jd b/docs/html/training/wearables/ui/index.jd
index 5d97490..f82d29c 100644
--- a/docs/html/training/wearables/ui/index.jd
+++ b/docs/html/training/wearables/ui/index.jd
@@ -7,7 +7,7 @@ page.image=wear/images/10_uilib.png
<div id="tb">
<h2>Dependencies and Prerequisites</h2>
<ul>
- <li>Android Studio 0.8 or later and Gradle 0.12 or later</li>
+ <li>Android 4.4W (API level 20) or higher on the wearable device</li>
</ul>
</div>
</div>
diff --git a/docs/html/training/wearables/watch-faces/index.jd b/docs/html/training/wearables/watch-faces/index.jd
index 453c30e..ec428c1 100644
--- a/docs/html/training/wearables/watch-faces/index.jd
+++ b/docs/html/training/wearables/watch-faces/index.jd
@@ -6,7 +6,6 @@ page.title=Creating Watch Faces
<div id="tb">
<h2>Dependencies and Prerequisites</h2>
<ul>
- <li>Android Studio 1.0.0 or later and Gradle 1.0 or later</li>
<li>Android 4.3 (API level 18) or higher on the handheld device</li>
<li>Android 5.0 (API level 21) or higher on the wearable device</li>
</ul>