Merge "more doc fixes for notifcations and wear" into klp-modular-dev
diff --git a/docs/html/design/media/wear/fitness.png b/docs/html/design/media/wear/fitness.png
new file mode 100644
index 0000000..18ae969
--- /dev/null
+++ b/docs/html/design/media/wear/fitness.png
Binary files differ
diff --git a/docs/html/design/wear/structure.jd b/docs/html/design/wear/structure.jd
index f5ed49d..67b218a 100644
--- a/docs/html/design/wear/structure.jd
+++ b/docs/html/design/wear/structure.jd
@@ -97,9 +97,6 @@
<h2 id="Custom">Breaking out of the card (with custom layouts)</h2>
-<p>There are some things you can’t do on a card. Swiping in many directions on a map or a joystick are a few examples. In those cases it might be good idea to momentarily go full screen.</p>
-
-
<a class="notice-developers" href="{@docRoot}training/wearables/apps/index.html">
<div>
<h3>Developer Docs</h3>
@@ -107,6 +104,8 @@
</div>
</a>
+<p>There are some things you can’t do on a card. Swiping in many directions on a map or a joystick are a few examples. In those cases it might be good idea to momentarily go full screen.</p>
+
<img src="{@docRoot}design/media/wear/customlayout.png" alt="" width="760px" />
<h3>When to go full screen</h3>
diff --git a/docs/html/preview/api-overview.jd b/docs/html/preview/api-overview.jd
index f992bf9..2e99194 100644
--- a/docs/html/preview/api-overview.jd
+++ b/docs/html/preview/api-overview.jd
@@ -110,7 +110,7 @@
href="{@docRoot}">developer.android.com</a>. These API elements are
formatted in {@code code style} in this document (without hyperlinks). For the
preliminary API documentation for these elements, download the <a
-href="{@docRoot}preview/l-developer-preview-reference.zip">preview
+href="http://storage.googleapis.com/androiddevelopers/preview/l-developer-preview-reference.zip">preview
reference</a>.</p>
<h2 id="Behaviors">Important Behavior Changes</h2>
diff --git a/docs/html/preview/google-play-services-wear.html b/docs/html/preview/google-play-services-wear.html
index ff43757..84647b7 100644
--- a/docs/html/preview/google-play-services-wear.html
+++ b/docs/html/preview/google-play-services-wear.html
@@ -38,30 +38,29 @@
<p>If you attended Google I/O, your registered Google account is automatically whitelisted for
these preview resources. You're done! Head to Step 2.</p>
-<p><stong><em>If you didn't attend Google I/O</em></strong> or want to use a different account,
-click following link to
-<a href="https://groups.google.com/group/io14androidweardev/subscribe" target="_blank">join
-the Google Group</a> and get whitelisted.</p>
+<p><strong><em>If you didn't attend Google I/O</em></strong> or want to use a different account,
+click following link to and get whitelisted.</p>
+
+<a style="font-size:24px" href="https://groups.google.com/group/io14androidweardev/subscribe" target="_blank">
+Join the Preview Group</a>
<h2 style="margin-bottom: 0px;">2. Download Required Apps</h2><hr>
-<p>You'll need the following apps to get the most out of Android Wear:</p>
+<p>You'll need the following apps to get the most out of Android Wear. You must be whitelisted
+in the Preview Group above and you must install these apps in this exact order:</p>
-<ul>
+<ol>
<li><a href="https://play.google.com/apps/testing/com.google.android.gms">Google Play services</a>:
Allows your Android Wear device to communicate with your handheld device. This is required to
use the Android Wear app and other apps listed below.</li>
+ <li><a href="https://play.google.com/apps/testing/com.google.android.googlequicksearchbox">Google
+ Search</a>: Enables searches from Android Wear</li>
<li><a href="https://play.google.com/apps/testing/com.google.android.wearable.app">Android Wear
Companion</a>: The app for pairing a handheld to a wearable and providing syncing of
notifications and data
</li>
- <li><a href="https://play.google.com/apps/testing/com.google.android.googlequicksearchbox">Google
- Search</a>: Enables searches from Android Wear</li>
- <li><a href="https://play.google.com/apps/testing/com.google.android.keep">Google Keep</a>:
- Supports the "Take a note" command</li>
- <li><a href="https://play.google.com/apps/testing/com.google.samples.apps.iosched">Google I/O
- 2014</a>:
- Supports session feedback from Android Wear</li>
- </ul>
+ <p class="note"><b>Note:</b> After becoming a tester, it can take up to 1 hour to get access to
+ the preview versions of these apps.</p>
+ </ol>
<p>To obtain these apps from Google Play, click each app link above and follow these instructions,
preferably from your mobile browser:</p>
@@ -72,9 +71,22 @@
<li>Click the <b>Download <app name> from the Play Store</b> link to go to Google Play
Store download page to get the app. The
following screenshot shows how the opt-in process looks like:
-<img style="margin-top:40px" src="/preview/images/opt-in.png"></li>
+<img style="margin-top:40px" src="/preview/images/opt-in.png" /></li>
</ol>
-<h2 style="margin-bottom: 0px;">3. Start Building</h2><hr>
+
+<h2>3. Download Optional Apps</h2>
+<p>Please join the Test Group and install the following apps to enhance your Android Wear experience:
+</p>
+
+<ol>
+ <li><a href="https://play.google.com/apps/testing/com.google.android.keep">Google Keep</a>:
+ Supports the "Take a note" command</li>
+ <li><a href="https://play.google.com/apps/testing/com.google.samples.apps.iosched">Google I/O
+ 2014</a>:
+ Supports session feedback from Android Wear</li>
+ </ol>
+
+<h2 style="margin-bottom: 0px;">4. Start Building</h2><hr>
<p>The Google Play services SDK is required if you want to sync and send data between wearable
and handheld devices. To get the new SDK that is compatible with the Google Play services
@@ -82,7 +94,8 @@
<p class="note"><b>Note:</b> Android Studio is required for Wear development.</p>
<ol>
- <li>Start AVD Manager.</li>
+ <li><a href="/sdk/installing/studio.html">Download and install Android Studio</a></li>
+ <li>Start SDK Manager.</li>
<li>Update the Android SDK Tools and Platform-tools to versions 23 and 20 respectively.</li>
<li>Click <b>Tools > Manage Add-on Sites > User Defined Sites</b>.</li>
<li>Click <b>New</b>, enter
@@ -91,14 +104,13 @@
<li>Click Close. You should now see new emulator images that support this preview
release of Google Play services and the Google Play services client libraries you need to
start developing.</li>
- <li><a href="{@docRoot}preview/google-play-services-preview.zip">Download</a> the Google Play
+ <li><a href="http://storage.googleapis.com/androiddevelopers/preview/google-play-services-preview.zip">Download</a> the Google Play
services reference documentation for this preview release.</li>.
</ol>
-<p>When you're done here, check out the <a href="{@docRoot}training/building-wearables">Building Apps for Wearables</a>
+<p>When you're done here, check out the <a href="/training/building-wearables.html">Building Apps for Wearables</a>
training classes for information on how to build for Wear.</p>
- </div>
</div> <!-- end jd-content -->
</div><!-- end doc-content -->
</div> <!-- end body-content -->
diff --git a/docs/html/preview/images/opt-in.png b/docs/html/preview/images/opt-in.png
index 0f309c2..7151253 100644
--- a/docs/html/preview/images/opt-in.png
+++ b/docs/html/preview/images/opt-in.png
Binary files differ
diff --git a/docs/html/preview/index.html b/docs/html/preview/index.html
index 4f3f150..4c42d99 100644
--- a/docs/html/preview/index.html
+++ b/docs/html/preview/index.html
@@ -257,7 +257,7 @@
Join the community of Android developers testing out the L Developer Preview and
share your thoughts and experiences.
</p><p class="landing-small">
- <a href="https://plus.google.com/communities/113159138894928487684">
+ <a href="http://g.co/androidldevpreview">
Discuss on Google+</a>
</p>
</div>
diff --git a/docs/html/preview/material/images/list_mail.png b/docs/html/preview/material/images/list_mail.png
index bd107ff..e70291c 100644
--- a/docs/html/preview/material/images/list_mail.png
+++ b/docs/html/preview/material/images/list_mail.png
Binary files differ
diff --git a/docs/html/preview/reference.jd b/docs/html/preview/reference.jd
index f70f7a2..b70e4e5 100644
--- a/docs/html/preview/reference.jd
+++ b/docs/html/preview/reference.jd
@@ -2,12 +2,10 @@
@jd:body
-<p>The reference documentation and API difference report are available as downloadable packages.
+<p>The reference documentation and API difference report are available in this downloadable package.
</p>
<ul>
- <li><a href="{@docRoot}preview/l-developer-preview-reference.zip">L
+ <li><a href="http://storage.googleapis.com/androiddevelopers/preview/l-developer-preview-reference.zip">L
Developer Preview reference</a></li>
- <li><a href="{@docRoot}preview/l-developer-preview-api-diff.zip">L
- Developer Preview difference report</a></li>
</ul>
\ No newline at end of file
diff --git a/docs/html/preview/support.jd b/docs/html/preview/support.jd
index 8efc4bc..9d7844b 100644
--- a/docs/html/preview/support.jd
+++ b/docs/html/preview/support.jd
@@ -7,7 +7,7 @@
our issue tracker.</p>
<p>For more support,
-<a href="https://plus.google.com/communities/113159138894928487684">join
+<a href="https://plus.google.com/communities/101985907812750684586">join
the L Developer Preview Google+ community</a> to discuss your development experiences.
diff --git a/docs/html/training/wearables/apps/index.jd b/docs/html/training/wearables/apps/index.jd
index 3a4eb70..a0d02fb 100644
--- a/docs/html/training/wearables/apps/index.jd
+++ b/docs/html/training/wearables/apps/index.jd
@@ -59,7 +59,7 @@
<dd>Learn how to create an Android Studio project that
contains both the wearable and handheld app modules and how to run the app on a device
or emulator.</dd>
- <dt><a href="{@docRoot}training/wearables/apps/activity.html">Creating Custom Layouts</a></dt>
+ <dt><a href="{@docRoot}training/wearables/apps/layouts.html">Creating Custom Layouts</a></dt>
<dd>Learn how to create and display custom layouts for notifications and
activities.</dd>
<dt><a href="{@docRoot}training/wearables/apps/voice.html">Adding Voice Capabilities</a></dt>
diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd
index c9b8ba85..5dd7690 100644
--- a/docs/html/wear/index.jd
+++ b/docs/html/wear/index.jd
@@ -152,7 +152,7 @@
for a hands-free experience.
</p>
<p class="landing-small">
- <a href="{@docRoot}training/wearables/apps/voice-actions.html">Integrate voice actions</a>
+ <a href="{@docRoot}training/wearables/apps/voice.html">Integrate voice actions</a>
</p>
</div>
<div class="col-4">
