summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/about/versions/jelly-bean.jd9
-rw-r--r--docs/html/channels/io2013.jd10
-rw-r--r--docs/html/design/downloads/index.jd8
-rw-r--r--docs/html/design/index.jd8
-rw-r--r--docs/html/develop/index.jd8
-rw-r--r--docs/html/distribute/googleplay/promote/badges.jd8
-rw-r--r--docs/html/distribute/googleplay/promote/brand.jd9
-rw-r--r--docs/html/distribute/googleplay/promote/index.jd8
-rw-r--r--docs/html/distribute/googleplay/promote/linking.jd8
-rw-r--r--docs/html/distribute/googleplay/publish/preparing.jd8
-rw-r--r--docs/html/distribute/googleplay/quality/core.jd8
-rw-r--r--docs/html/distribute/googleplay/quality/index.jd8
-rw-r--r--docs/html/distribute/googleplay/quality/tablet.jd8
-rw-r--r--docs/html/distribute/googleplay/spotlight/index.jd9
-rw-r--r--docs/html/distribute/index.jd8
-rw-r--r--docs/html/distribute/promote/device-art.jd8
-rw-r--r--docs/html/google/backup/signup.jd2
-rw-r--r--docs/html/google/index.jd8
-rw-r--r--docs/html/google/play/billing/index.jd8
-rw-r--r--docs/html/guide/components/index.jd8
-rw-r--r--docs/html/images/tools/studio_error_eventlog.pngbin0 -> 2259 bytes
-rw-r--r--docs/html/images/tools/studio_error_gradle5.pngbin0 -> 48854 bytes
-rw-r--r--docs/html/images/tools/studio_error_supportlib.pngbin0 -> 171678 bytes
-rw-r--r--docs/html/index.jd8
-rw-r--r--docs/html/sdk/installing/studio.jd197
-rw-r--r--docs/html/tools/index.jd9
-rw-r--r--docs/html/training/index.jd9
-rw-r--r--docs/html/training/sync-adapters/creating-authenticator.jd2
-rw-r--r--docs/html/training/sync-adapters/index.jd2
29 files changed, 351 insertions, 35 deletions
diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd
index 71957be..5812f3d 100644
--- a/docs/html/about/versions/jelly-bean.jd
+++ b/docs/html/about/versions/jelly-bean.jd
@@ -5,7 +5,14 @@ tab2=Android 4.1
tab2.link=#android-41
@jd:body
-
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<style>
#android-41 {display:none;}
diff --git a/docs/html/channels/io2013.jd b/docs/html/channels/io2013.jd
index 977eb2f..b2bde31 100644
--- a/docs/html/channels/io2013.jd
+++ b/docs/html/channels/io2013.jd
@@ -1,7 +1,15 @@
fullpage=true
page.title=Google I/O 13
@jd:body
-
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
+
<style>
#ioplayer-frame {
z-index:10;
diff --git a/docs/html/design/downloads/index.jd b/docs/html/design/downloads/index.jd
index 00f4467..ab6bb1b 100644
--- a/docs/html/design/downloads/index.jd
+++ b/docs/html/design/downloads/index.jd
@@ -1,5 +1,13 @@
page.title=Downloads
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<div class="layout-content-row">
<div class="layout-content-col span-9">
diff --git a/docs/html/design/index.jd b/docs/html/design/index.jd
index 1e6b40c..d4ef07f 100644
--- a/docs/html/design/index.jd
+++ b/docs/html/design/index.jd
@@ -2,6 +2,14 @@ page.title=Design
header.hide=1
footer.hide=1
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<style>
#landing-graphic-container {
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 7b5cb4a..f96e868 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -4,6 +4,14 @@ header.hide=1
carousel=1
tabbedList=1
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<style>
#noplayer-message {
diff --git a/docs/html/distribute/googleplay/promote/badges.jd b/docs/html/distribute/googleplay/promote/badges.jd
index 9a32921..93092bf 100644
--- a/docs/html/distribute/googleplay/promote/badges.jd
+++ b/docs/html/distribute/googleplay/promote/badges.jd
@@ -1,5 +1,13 @@
page.title=Google Play Badges
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<p itemprop="description">Google Play badges allow you to promote your app with official branding
in your online ads, promotional materials, or anywhere else you want a link to your app.</p>
diff --git a/docs/html/distribute/googleplay/promote/brand.jd b/docs/html/distribute/googleplay/promote/brand.jd
index 265584f..a047b1f 100644
--- a/docs/html/distribute/googleplay/promote/brand.jd
+++ b/docs/html/distribute/googleplay/promote/brand.jd
@@ -1,6 +1,13 @@
page.title=Brand Guidelines
@jd:body
-
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<p>We encourage you to use the Android and Google Play brands with your Android app
diff --git a/docs/html/distribute/googleplay/promote/index.jd b/docs/html/distribute/googleplay/promote/index.jd
index 6882990..14f37c4 100644
--- a/docs/html/distribute/googleplay/promote/index.jd
+++ b/docs/html/distribute/googleplay/promote/index.jd
@@ -3,6 +3,14 @@ page.metaDescription=Raise the visibility of your apps in Google Play through de
header.hide=0
footer.hide=0
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<!--
<style>
diff --git a/docs/html/distribute/googleplay/promote/linking.jd b/docs/html/distribute/googleplay/promote/linking.jd
index 4fdc5db..014582a 100644
--- a/docs/html/distribute/googleplay/promote/linking.jd
+++ b/docs/html/distribute/googleplay/promote/linking.jd
@@ -1,5 +1,13 @@
page.title=Linking to Your Products
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<div class="sidebox-wrapper">
<div class="sidebox">
diff --git a/docs/html/distribute/googleplay/publish/preparing.jd b/docs/html/distribute/googleplay/publish/preparing.jd
index 5593f4f..dd35b25 100644
--- a/docs/html/distribute/googleplay/publish/preparing.jd
+++ b/docs/html/distribute/googleplay/publish/preparing.jd
@@ -1,6 +1,14 @@
page.title=Launch Checklist
page.tags="publishing","launch","Google Play", "Developer Console"
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<div id="qv-wrapper"><div id="qv">
<h2>Checklist</h2>
diff --git a/docs/html/distribute/googleplay/quality/core.jd b/docs/html/distribute/googleplay/quality/core.jd
index 9e23bcc..3fd221c 100644
--- a/docs/html/distribute/googleplay/quality/core.jd
+++ b/docs/html/distribute/googleplay/quality/core.jd
@@ -1,5 +1,13 @@
page.title=Core App Quality Guidelines
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<div id="qv-wrapper"><div id="qv">
<h2>Quality Criteria</h2>
diff --git a/docs/html/distribute/googleplay/quality/index.jd b/docs/html/distribute/googleplay/quality/index.jd
index ef537b1..def42e5 100644
--- a/docs/html/distribute/googleplay/quality/index.jd
+++ b/docs/html/distribute/googleplay/quality/index.jd
@@ -1,5 +1,13 @@
page.title=App Quality
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<p>App quality directly influences the long-term success of your app&mdash;in
terms of installs, user rating and reviews, engagement, and user retention.
diff --git a/docs/html/distribute/googleplay/quality/tablet.jd b/docs/html/distribute/googleplay/quality/tablet.jd
index 5a707be..c80c3cc 100644
--- a/docs/html/distribute/googleplay/quality/tablet.jd
+++ b/docs/html/distribute/googleplay/quality/tablet.jd
@@ -1,5 +1,13 @@
page.title=Tablet App Quality Checklist
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<div id="qv-wrapper"><div id="qv">
<h2>Checklist</h2>
diff --git a/docs/html/distribute/googleplay/spotlight/index.jd b/docs/html/distribute/googleplay/spotlight/index.jd
index b83080e..88cdec4 100644
--- a/docs/html/distribute/googleplay/spotlight/index.jd
+++ b/docs/html/distribute/googleplay/spotlight/index.jd
@@ -3,7 +3,14 @@ walkthru=0
header.hide=0
@jd:body
-
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<p>Android developers, their apps, and their successes with Android and Google Play. </p>
diff --git a/docs/html/distribute/index.jd b/docs/html/distribute/index.jd
index 54f9301..8e7c6e1 100644
--- a/docs/html/distribute/index.jd
+++ b/docs/html/distribute/index.jd
@@ -2,6 +2,14 @@ page.title=Distribute Apps
header.hide=1
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<div class="marquee">
diff --git a/docs/html/distribute/promote/device-art.jd b/docs/html/distribute/promote/device-art.jd
index 55b846e..58e183c 100644
--- a/docs/html/distribute/promote/device-art.jd
+++ b/docs/html/distribute/promote/device-art.jd
@@ -1,5 +1,13 @@
page.title=Device Art Generator
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<p>The device art generator allows you to quickly wrap your app screenshots in real device artwork.
This provides better visual context for your app screenshots on your web site or in other
diff --git a/docs/html/google/backup/signup.jd b/docs/html/google/backup/signup.jd
index 550d590..f9ad600 100644
--- a/docs/html/google/backup/signup.jd
+++ b/docs/html/google/backup/signup.jd
@@ -226,7 +226,7 @@ onclick="onRegister(); return false;" >Register with Android Backup Service</a><
} else if ($("input#agree").is(':checked')
&& packagename.length
&& packagename != DEFAULT_TEXT) {
- window.location = "https://play.google.com/apps/publish/v2/GetBackupApiKey?p=" +
+ window.location = "https://play.google.com/apps/publish/GetBackupApiKey?p=" +
encodeURIComponent(packagename);
} else {
$("label#agreeLabel,label#pnameLabel").parent().stop().animate({color: "#258AAF"}, 200,
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index 4020cf4..095388e 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -1,6 +1,14 @@
page.title=Google Services
header.hide=1
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<style>
div.landing-cell,
diff --git a/docs/html/google/play/billing/index.jd b/docs/html/google/play/billing/index.jd
index 481a79c..0818514 100644
--- a/docs/html/google/play/billing/index.jd
+++ b/docs/html/google/play/billing/index.jd
@@ -1,5 +1,13 @@
page.title=Google Play In-app Billing
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<p>In-app Billing is a Google Play service that lets you sell digital content from inside
your applications. You can use the service to sell a wide range of content, including downloadable
diff --git a/docs/html/guide/components/index.jd b/docs/html/guide/components/index.jd
index 87bae53..6ede873 100644
--- a/docs/html/guide/components/index.jd
+++ b/docs/html/guide/components/index.jd
@@ -4,6 +4,14 @@ page.landing.intro=Android's application framework lets you create extremely ric
page.landing.image=images/develop/app_components.png
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<div class="landing-docs">
diff --git a/docs/html/images/tools/studio_error_eventlog.png b/docs/html/images/tools/studio_error_eventlog.png
new file mode 100644
index 0000000..909b285
--- /dev/null
+++ b/docs/html/images/tools/studio_error_eventlog.png
Binary files differ
diff --git a/docs/html/images/tools/studio_error_gradle5.png b/docs/html/images/tools/studio_error_gradle5.png
new file mode 100644
index 0000000..13de607
--- /dev/null
+++ b/docs/html/images/tools/studio_error_gradle5.png
Binary files differ
diff --git a/docs/html/images/tools/studio_error_supportlib.png b/docs/html/images/tools/studio_error_supportlib.png
new file mode 100644
index 0000000..603b54c
--- /dev/null
+++ b/docs/html/images/tools/studio_error_supportlib.png
Binary files differ
diff --git a/docs/html/index.jd b/docs/html/index.jd
index d82deec..a972309 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -3,6 +3,14 @@ no_footer_links=true
carousel=true
page.metaDescription=The official site for Android developers. Provides the Android SDK and documentation for app developers and designers.
@jd:body
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<div class="wrap">
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index 8825bcc..2e9c4b4 100644
--- a/docs/html/sdk/installing/studio.jd
+++ b/docs/html/sdk/installing/studio.jd
@@ -249,36 +249,36 @@ download (or continue to use) the
<td>Windows</td>
<td>
<a onclick="return onDownload(this)" id="win-studio"
- href="http://dl.google.com/android/studio/android-studio-bundle-130.687321-windows.exe">
- android-studio-bundle-130.677228-windows.exe
+ href="http://dl.google.com/android/studio/android-studio-bundle-130.737825-windows.exe">
+ android-studio-bundle-130.737825-windows.exe
</a>
</td>
- <td>393023485 bytes</td>
- <td>3da987a9778b66edb68fb43d8b53bfcb</td>
+ <td>396091268 bytes</td>
+ <td>6da1bc8effa048c8ff669e4c484eb11f</td>
</tr>
<tr>
<td><nobr>Mac OS X</nobr></td>
<td>
<a onclick="return onDownload(this)" id="mac-studio"
- href="http://dl.google.com/android/studio/android-studio-bundle-130.687321-mac.dmg">
- android-studio-bundle-130.687321-mac.dmg
+ href="http://dl.google.com/android/studio/android-studio-bundle-130.737825-mac.dmg">
+ android-studio-bundle-130.737825-mac.dmg
</a>
</td>
- <td>379877697 bytes</td>
- <td>eb5ca6c77f4a119595d941daeda58810</td>
+ <td>383326582 bytes</td>
+ <td>2959bc5039238d286670cc6225342b89</td>
</tr>
<tr>
<td>Linux</td>
<td>
<a onclick="return onDownload(this)" id="linux-studio"
- href="http://dl.google.com/android/studio/android-studio-bundle-130.687321-linux.tgz">
- android-studio-bundle-130.687321-linux.tgz
+ href="http://dl.google.com/android/studio/android-studio-bundle-130.737825-linux.tgz">
+ android-studio-bundle-130.737825-linux.tgz
</a>
</td>
- <td>406516375 bytes</td>
- <td>6796d66de07c85b2822ca8d501a043c0</td>
+ <td>409935592 bytes</td>
+ <td>dcd13922f7cf577e3c852b224205d843</td>
</tr>
</table>
@@ -286,6 +286,25 @@ download (or continue to use) the
+<h2 id="Updating">Updating to 0.2.x</h2>
+
+<p>To update from Android Studio 0.1.x to 0.2.x,
+follow the <a href="#Installing">installation instructions</a> below and replace your existing
+installation.</p>
+
+<p class="caution"><strong>Caution:</strong> Replacing your existing installation of
+Android Studio will remove any additional SDK packages you've installed, such as target
+platforms, system images, and sample apps. To preserve these, copy them from your current
+SDK directory under Android Studio to a temporary location
+before installing the update. Then move them back once the update is complete.
+If you fail to copy these packages, then you can instead download them again through
+the Android SDK Manager.</p>
+
+<p>Also note that due to the update to Gradle 0.5, you will encounter errors when opening
+existing projects. See the <a href="#Troubleshooting">Troubleshooting</a> notes below for
+information about how to resolve them.</p>
+
+
<h2 id="Installing">Installing Android Studio</h2>
<ol>
<li>Download the <strong>Android Studio</strong> package from above.</li>
@@ -390,14 +409,78 @@ style="vertical-align:bottom;margin:0;height:19px" /> in the toolbar.</p>
<h2 id="Revisions">Revisions</h2>
-<p class="note"><strong>Note:</strong> Periodic updates are pushed to Android Studio
-without requiring you to update from here. To manually check for updates, select
-<strong>Help > Check for updates</strong> (on Mac, select <strong>Android Studio >
-Check for updates</strong>).</p>
+<p class="note"><strong>Note:</strong> <strong>There is not a patch update available from
+0.1.9 to 0.2</strong>. To update from Android Studio 0.1.x to 0.2.x, you must
+install a new Android Studio bundle from this page. The reason for that is that we have made
+changes to the bundled SDK such that it includes a pre-configured local Maven repository
+which can serve up the v4 support library and which is required for creating new projects.</p>
+
<div class="toggle-content opened">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
+ alt=""/>Android Studio v0.2.x</a> <em>(July 2013)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+ <ul>
+ <li>Merged in the latest IntelliJ codebase changes. Includes fixes for issues reported by Studio users such as tweaks to Linux font sizes and font rendering.</li>
+ <li>Android Gradle plug-in updated to 0.5.0.
+ <p class="caution"><strong>Caution:</strong> This new version is not backwards compatible.
+ When opening a project that uses an older version of the plug-in, Studio will show an error
+ stating <strong>Gradle &lt;project_name&gt; project refresh failed.</strong> See <a
+ href="#Troubleshooting">Troubleshooting</a> below for details.</p>
+ <p>The updated Gradle plug-in includes the following changes:</p>
+ <ul>
+ <li>Fixed IDE model to contain the output file even if it's customized through the DSL. Also
+ fixed the DSL to get/set the output file on the variant object so that it's not necessary to
+ use <code>variant.packageApplication or variant.zipAlign</code></li>
+ <li>Fixed dependency resolution so that we resolved the combination of (default config,
+ build types, flavor(s)) together instead of separately.</li>
+ <li>Fixed dependency for tests of library project to properly include all the dependencies
+ of the library itself.</li>
+ <li>Fixed case where two dependencies have the same leaf name.</li>
+ <li>Fixed issue where Proguard rules file cannot be applied on flavors.</li>
+ </ul>
+ <p>All Gradle plugin release notes are available are here: <a href=
+ "http://tools.android.com/tech-docs/new-build-system"
+ >http://tools.android.com/tech-docs/new-build-system</a>.</p>
+ </li>
+ <li>Gradle errors from aapt no longer point to merged output files in the build/ folder, they
+ point back to the real source locations.</li>
+ <li>Parallel Builds. It's now possible to use Gradle's parallel builds. Please be aware that
+ parallel builds are in "incubation" (see <a
+ href="http://www.gradle.org/docs/current/userguide/gradle_command_line.html">Gradle's
+ documentation</a>.) This feature is off by default. To enable it, go to
+ <strong>Preferences</strong> &gt; <strong>Compiler</strong> and check the box <em>Compile
+ independent modules in parallel</em>.</li>
+ <li>Further work on the new resource repository used for layout rendering, resource
+ folding in the editor, and more:
+ <ul>
+ <li>Basic support for .aar library dependencies (e.g. using a library without a local copy of
+ the sources). Still not working for resource XML validation and navigation in source editors.
+ </li>
+ <li>Cycle detection in resource references.</li>
+ <li>Quick Documentation (F1), which can show all translations of the string under the caret,
+ will now also show all resource overlays from the various Gradle flavors and build types, as
+ well as libraries. They are listed in reverse resource overlay order, with strikethrough on
+ the versions of the string that are masked.</li>
+ <li>Fixes to handle updating the merged resources when the set of module dependencies
+ change.</li>
+ <li>XML rendering fixes to properly handle character entity declarations and XML and unicode
+ escapes.</li>
+ </ul>
+ <li>Save screenshot support for the layout preview and layout editor windows.</li>
+ <li>Template bug fixes.</li>
+ <li>Lint bug fixes.</li>
+ <li>Various fixes for crash reports. Thank you, and keep filing crash reports!</li>
+ </ul>
+ </div>
+</div>
+
+<div class="toggle-content closed">
+ <p><a href="#" onclick="return toggleContent(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
alt=""/>Android Studio v0.1.x</a> <em>(May 2013)</em>
</p>
@@ -408,13 +491,76 @@ Check for updates</strong>).</p>
</div>
</div>
+<p>&nbsp;</p>
+
+<p class="note"><strong>Note:</strong> Periodic updates are pushed to Android Studio
+without requiring you to update from here. To manually check for updates, select
+<strong>Help > Check for updates</strong> (on Mac, select <strong>Android Studio >
+Check for updates</strong>).</p>
+
+
+
+
+<h2 id="Troubleshooting">Troubleshooting</h2>
+
+
+<div class="figure" style="width:330px">
+<img src="{@docRoot}images/tools/studio_error_gradle5.png" width="330"/>
+<p class="img-caption"><strong>Figure 1.</strong> Error dialog when opening an existing project.</p>
+</div>
+
+<h3>Error: Gradle project refresh failed</h3>
+
+<p>Android Studio 0.2.0 has updated the Gradle plug-in to 0.5.0, which is not backwards compatible.
+When opening a project that uses an older version of the plug-in, Studio will display the error
+shown in figure 1 in the upper right corner of the IDE.
+To resolve the error, you must change the version of the Android Gradle plug-in to 0.5.0.</p>
+
+<ol>
+ <li>Click the link in the error dialog <strong>Search in build.gradle files</strong>. If the dialog
+is no longer visible, click <strong>Event Log</strong>
+<img src="{@docRoot}images/tools/studio_error_eventlog.png"
+style="vertical-align:bottom;margin:0;height:19px"/> in the bottom-right corner of the IDE,
+then click <strong>Search in build.gradle files</strong>.</li>
+ <li>Double-click the line under the <em>build.gradle</em> usage. For example:
+ <strong>classpath 'com.android.tools.build:gradle:0.4</strong>. This opens the project
+ <code>build.gradle</code> file.</li>
+ <li>Edit the <code>classpath</code> to change the gradle version to <code>0.5.+</code>.
+ For example:
+ <pre class="no-pretty-print">
+dependencies {
+ classpath 'com.android.tools.build:gradle:<strong>0.5.+</strong>'
+}
+</pre>
+ </li>
+ <li>Save the file and rebuild your project.</li>
+</ol>
+<div class="figure" style="width:330px">
+<img src="{@docRoot}images/tools/studio_error_supportlib.png" width="330"/>
+<p class="img-caption"><strong>Figure 2.</strong> Error dialog when creating a new project
+or opening a project using the support library.</p>
+</div>
+<h3>Error: Failed to import Gradle project</h3>
+<p>If, after updating to Android Studio 0.2.x and creating or opening a project, you receive an
+error stating <em>"Could not find any version that matches
+com.android.support:support-v4:13.0.+"</em>, then you must install the <strong>Android Studio
+Repository</strong>. This was likely caused because you're pointing Android Studio to an external
+Android SDK location that does not have the new Maven repository included with Android Studio
+0.2.x. This new Maven repository is used by the new build system for the Support Library, instead
+of using the Support Library JAR files, so must be present in the SDK.</p>
+<ol>
+ <li>Open the <strong>Android SDK Manager</strong>.</li>
+ <li>Expand the <strong>Extras</strong> directory
+and install <strong>Android Studio Repository</strong>.</li>
+</ol>
+
</div><!-- end main content -->
@@ -430,7 +576,7 @@ Check for updates</strong>).</p>
-
+
<script>
var os;
var bundlename;
@@ -450,15 +596,15 @@ Check for updates</strong>).</p>
if (os) {
/* set up primary ACE download button */
$('#download-ide-button').show();
- $('#download-ide-button').append("Download Android Studio <span class='small'>v0.1.x</span>"
- + "<br/><span class='small'>for " + os + "</span>");
+ $('#download-ide-button').append("Download Android Studio <span class='small'>v0.2.x</span>"
+ + "<br/> <span class='small'>for " + os + "</span>");
$('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename);
} else {
$('.pax').show();
}
-
-
+
+
function onDownload(link, button) {
var $studioLink;
@@ -470,7 +616,7 @@ Check for updates</strong>).</p>
$studioLink = $(link);
$("#downloadForRealz").html("Download " + $(link).text());
}
-
+
$("#downloadForRealz").attr('href', $studioLink.attr('href'));
$("#tos").fadeIn('fast');
@@ -493,10 +639,9 @@ Check for updates</strong>).</p>
function onDownloadForRealz(link) {
if ($("input#agree").is(':checked')) {
- $("div.sdk-terms,#sdk-terms-form,.sdk-terms-intro").hide();
- $("#main").show(function() {
- location.hash = "Installing";
- });
+ $("#tos").hide();
+ $("#main").show();
+ location.hash = "Updating";
return true;
} else {
$("label#agreeLabel,#bitpicker input").parent().stop().animate({color: "#258AAF"}, 200,
diff --git a/docs/html/tools/index.jd b/docs/html/tools/index.jd
index f9d452c..e9094a7 100644
--- a/docs/html/tools/index.jd
+++ b/docs/html/tools/index.jd
@@ -1,6 +1,13 @@
page.title=Developer Tools
@jd:body
-
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<img src="{@docRoot}images/tools-home.png" style="float:right;" height="415" width="763" />
diff --git a/docs/html/training/index.jd b/docs/html/training/index.jd
index 72ad018..82fbd16 100644
--- a/docs/html/training/index.jd
+++ b/docs/html/training/index.jd
@@ -3,7 +3,14 @@ page.trainingcourse=true
page.metaDescription=Android Training provides a collection of classes that aim to help you build great apps for Android. Each class explains the steps required to solve a problem or implement a feature using code snippets and sample code for you to use in your apps.
@jd:body
-
+<div id="butterbar-wrapper" >
+ <div id="butterbar" >
+ <div id="butterbar-message">
+<a target="_blank" href="https://docs.google.com/a/google.com/forms/d/1EHLPGqhbxj2HungHRRN4_0K9TGpc-Izy-u46vBDgS8Q/viewform">
+ Take the Android Developer Survey</a>
+ </div>
+ </div>
+</div>
<p>Welcome to Training for Android developers. Here you'll find sets of lessons within classes
that describe how to accomplish a specific task with code samples you can re-use in your app.
diff --git a/docs/html/training/sync-adapters/creating-authenticator.jd b/docs/html/training/sync-adapters/creating-authenticator.jd
index 1b272e7..dfa9027 100644
--- a/docs/html/training/sync-adapters/creating-authenticator.jd
+++ b/docs/html/training/sync-adapters/creating-authenticator.jd
@@ -235,7 +235,7 @@ public class AuthenticatorService extends Service {
<p>
The following snippet shows the XML file for the authenticator you created previously:
</p>
-<pre>the
+<pre>
&lt;?xml version="1.0" encoding="utf-8"?&gt;
&lt;account-authenticator
xmlns:android="http://schemas.android.com/apk/res/android"
diff --git a/docs/html/training/sync-adapters/index.jd b/docs/html/training/sync-adapters/index.jd
index 1f7977b..b107cbe 100644
--- a/docs/html/training/sync-adapters/index.jd
+++ b/docs/html/training/sync-adapters/index.jd
@@ -11,7 +11,7 @@ startpage=true
<h2>Dependencies and prerequisites</h2>
<ul>
- <li>Android 3.0 (API Level 11) or higher</li>
+ <li>Android 2.1 (API Level 7) or higher</li>
</ul>
<h2>You should also read</h2>