diff options
| author | Ricardo Cervera <rcervera@google.com> | 2014-06-19 05:29:37 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-18 22:47:18 +0000 |
| commit | 10276c32ec0a15fa444c1f3fa6ec9e8d1002cb6e (patch) | |
| tree | d0207efa8dd65cd86978b47e6ea7781a789296ab /docs/html | |
| parent | 84611a1fe13299e3279d9bc5b0a2ec33d54c7e92 (diff) | |
| parent | 3812613373d8e4bd8825aaab5e6c42e7a5689864 (diff) | |
| download | frameworks_base-10276c32ec0a15fa444c1f3fa6ec9e8d1002cb6e.zip frameworks_base-10276c32ec0a15fa444c1f3fa6ec9e8d1002cb6e.tar.gz frameworks_base-10276c32ec0a15fa444c1f3fa6ec9e8d1002cb6e.tar.bz2 | |
Merge "docs: Updated the screenshot for the Android Studio page." into klp-modular-dev
Diffstat (limited to 'docs/html')
| -rw-r--r-- | docs/html/images/tools/android-studio.png | bin | 120146 -> 0 bytes | |||
| -rw-r--r-- | docs/html/images/tools/laptop-studio.png | bin | 0 -> 310955 bytes | |||
| -rw-r--r-- | docs/html/sdk/installing/studio.jd | 4 |
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/images/tools/android-studio.png b/docs/html/images/tools/android-studio.png Binary files differdeleted file mode 100644 index 4d93a86..0000000 --- a/docs/html/images/tools/android-studio.png +++ /dev/null diff --git a/docs/html/images/tools/laptop-studio.png b/docs/html/images/tools/laptop-studio.png Binary files differnew file mode 100644 index 0000000..3684ff0 --- /dev/null +++ b/docs/html/images/tools/laptop-studio.png diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd index 8ac6163..894514a 100644 --- a/docs/html/sdk/installing/studio.jd +++ b/docs/html/sdk/installing/studio.jd @@ -186,7 +186,7 @@ This is the Android Software Development Kit License Agreement <div id="main"> <div class="figure" style="width:400px;margin-top:-75px"> -<img src="{@docRoot}images/tools/android-studio.png" height="330" width="400" style="margin-bottom:20px" /> +<img src="{@docRoot}images/tools/laptop-studio.png" height="366" width="400" style="margin-bottom:20px" /> <a class="big button subtitle" id="download-ide-button" href="" style="display:none;width:368px;margin:0 auto;display:block;font-size:18px" ></a> @@ -218,7 +218,7 @@ capabilities you expect from IntelliJ, Android Studio offers:</p> <li>Lint tools to catch performance, usability, version compatibility, and other problems.</li> <li>ProGuard and app-signing capabilities.</li> <li>Built-in support for <a - href="http://android-developers.blogspot.com/2013/06/adding-backend-to-your-app-in-android.html" + href="https://developers.google.com/cloud/devtools/android_studio_templates/" class="external-link">Google Cloud Platform</a>, making it easy to integrate Google Cloud Messaging and App Engine. </ul> |
