summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-06-06 17:51:20 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-06-06 17:51:20 -0700
commitb8e4d95c22e0f44aee5cb3001262b5154bf90cb7 (patch)
tree55e40d29f76e4f500b6a5f58d4c821f272c3734c /docs
parent865047f80c04a2c539d6d5052fca5436dcb7e0e3 (diff)
parenta7ba45ec7cbaaa1dbfcd6601bb42abd5ea39547f (diff)
downloadframeworks_base-b8e4d95c22e0f44aee5cb3001262b5154bf90cb7.zip
frameworks_base-b8e4d95c22e0f44aee5cb3001262b5154bf90cb7.tar.gz
frameworks_base-b8e4d95c22e0f44aee5cb3001262b5154bf90cb7.tar.bz2
am a7ba45ec: am 7381c7e5: am b2b216e7: add links to a couple intellij docs for Eclipse users
* commit 'a7ba45ec7cbaaa1dbfcd6601bb42abd5ea39547f': add links to a couple intellij docs for Eclipse users
Diffstat (limited to 'docs')
-rw-r--r--docs/html/sdk/installing/migrate.jd11
-rw-r--r--docs/html/sdk/installing/studio-tips.jd11
2 files changed, 22 insertions, 0 deletions
diff --git a/docs/html/sdk/installing/migrate.jd b/docs/html/sdk/installing/migrate.jd
index 20a698b..db1b5dd 100644
--- a/docs/html/sdk/installing/migrate.jd
+++ b/docs/html/sdk/installing/migrate.jd
@@ -2,6 +2,17 @@ page.title=Migrating from Eclipse
@jd:body
+<div id="qv-wrapper">
+<div id="qv">
+<h2>See also</h2>
+<ul>
+ <li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/Working+in+Eclipse+Compatibility+Mode" class="external-link"
+ >Eclipse Compatibility Mode</a></li>
+ <li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA" class="external-link"
+ >FAQ on Migrating</a></li>
+</ul>
+</div>
+</div>
<p>If you've previously developed for Android using Eclipse and would like to migrate
to Android Studio, you should export your projects from Eclipse in order to generate
diff --git a/docs/html/sdk/installing/studio-tips.jd b/docs/html/sdk/installing/studio-tips.jd
index 259087b..a686efd 100644
--- a/docs/html/sdk/installing/studio-tips.jd
+++ b/docs/html/sdk/installing/studio-tips.jd
@@ -2,6 +2,17 @@ page.title=Android Studio Tips and Tricks
@jd:body
+<div id="qv-wrapper">
+<div id="qv">
+<h2>See also</h2>
+<ul>
+ <li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/Working+in+Eclipse+Compatibility+Mode" class="external-link"
+ >Eclipse Compatibility Mode</a></li>
+ <li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA" class="external-link"
+ >FAQ on Migrating</a></li>
+</ul>
+</div>
+</div>
<p>If you're unfamiliar with the IntelliJ IDEA interface, you might be wondering
how to accomplish some common tasks in Android Studio. This page provides some tips