summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-09-25 16:48:58 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-25 16:48:58 -0700
commitad95c41518c22264540a777562db23a8ccfa792a (patch)
tree6758bc075115141fecfe6376829c9d14bbfb434d /docs
parent7736463172804b054e75a9a4911c061c30d00347 (diff)
parent857814c688e6c867cf1e433091931bc84d15d1cb (diff)
downloadframeworks_base-ad95c41518c22264540a777562db23a8ccfa792a.zip
frameworks_base-ad95c41518c22264540a777562db23a8ccfa792a.tar.gz
frameworks_base-ad95c41518c22264540a777562db23a8ccfa792a.tar.bz2
am 857814c6: add mention of google cloud to Android Studio landing page
* commit '857814c688e6c867cf1e433091931bc84d15d1cb': add mention of google cloud to Android Studio landing page
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/installing/studio.jd6
1 files changed, 5 insertions, 1 deletions
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index 5a47f85..3399ee8 100644
--- a/docs/html/sdk/installing/studio.jd
+++ b/docs/html/sdk/installing/studio.jd
@@ -187,7 +187,7 @@ This is the Android Software Development Kit License Agreement
<div id="main">
-<div class="figure" style="width:400px;margin-top:-50px">
+<div class="figure" style="width:400px;margin-top:-20px">
<img src="{@docRoot}images/tools/android-studio.png" height="330" width="400" style="margin-bottom:20px" />
<a class="big button subtitle" id="download-ide-button"
@@ -221,6 +221,10 @@ capabilities you expect from IntelliJ, Android Studio offers:</p>
<li>Template-based wizards to create common Android designs and components.</li>
<li>A rich layout editor that allows you to drag-and-drop UI components, preview layouts on
multiple screen configurations, and much more.</li>
+ <li>Built-in support for <a
+ href="http://android-developers.blogspot.com/2013/06/adding-backend-to-your-app-in-android.html"
+ class="external-link">Google Cloud Platform</a>, making it easy to integrate Google Cloud
+ Messaging and App Engine as server-side components.
</ul>
<p class="caution"><strong>Caution:</strong> Android Studio is currently available as