am edd662ff: docs: final changes to index
* commit 'edd662ff667a404969b9f892bdb10ceaa5e2db25':
docs: final changes to index
diff --git a/docs/html/images/material.png b/docs/html/images/material.png
new file mode 100644
index 0000000..981359b
--- /dev/null
+++ b/docs/html/images/material.png
Binary files differ
diff --git a/docs/html/images/resource-card-android-studio.png b/docs/html/images/resource-card-android-studio.png
new file mode 100644
index 0000000..0f483df
--- /dev/null
+++ b/docs/html/images/resource-card-android-studio.png
Binary files differ
diff --git a/docs/html/index.jd b/docs/html/index.jd
index c9efcb3..253a7a5 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -14,21 +14,21 @@
<div class="static resource-flow-layout wrap col-16">
<div class="resource resource-card resource-card-18x6">
-
<div class="landing-section-header">
- <div class="col-10"><img src="{@docRoot}preview/images/l-dev-prev.png" style=" margin:40px 60px 0 20px"></div>
- <div class="col-5" style=" margin-top:60px "><p>
- <h3>L Developer Preview</h3>
- Get an early look at the next release of the Android platform.
- The L Developer Preview lets you try out all the new features of the next major
- release of Android. </p><br/>
- <a href="{@docRoot}preview/index.html" class="landing-button landing-primary">Get Started</a>
+ <div class="col-10"><img src="{@docRoot}preview/images/l-dev-prev.png"
+ style="margin:40px 60px 0 20px"></div>
+ <div class="col-5" style=" margin-top:70px ">
+ <h3 stye="font-weight:300;">L Developer Preview</h3>
+ <p>The L Developer Preview lets you design and develop against the next major
+ release of Android. Take the time to test and build your app before the platform
+ officially launches. </p>
+ <a href="{@docRoot}preview/index.html" class="landing-button landing-primary">Learn More</a>
</div>
</div>
</div>
</div>
- <h2 style="margin-bottom: 0px;"> </h2>
- <div style="margin-top:10px" class="resource-widget resource-flow-layout wrap col-16
+ <h2> </h2>
+ <div style="margin-top:20px" class="resource-widget resource-flow-layout wrap col-16
no-section" data-query="collection:index/primary" data-resourcestyle="card"
data-sortorder="-timestamp" data-maxresults="3" data-cardsizes="6x2,6x2,6x2"></div> <!-- end .resource-widget -->
</div> <!-- end .wrap -->
@@ -36,7 +36,7 @@
</div> <!-- end .fullscreen-carousel-content -->
</div> <!-- end .fullscreen-carousel -->
-<div class="actions-bar" style="margin-top:40px">
+<div class="actions-bar" style="margin-top:20px">
<div class="wrap">
<div class="actions">
<div><a href="{@docRoot}sdk/index.html">Get the SDK</a></div>
diff --git a/docs/html/preview/google-play-services-wear.html b/docs/html/preview/google-play-services-wear.html
index f225f7a..ff43757 100644
--- a/docs/html/preview/google-play-services-wear.html
+++ b/docs/html/preview/google-play-services-wear.html
@@ -80,7 +80,7 @@
and handheld devices. To get the new SDK that is compatible with the Google Play services
APK that you just installed, follow these steps: </p>
-<p class="note"><b>Note:</b> We highly recommend you use Android Studio for Wear development.</p>
+<p class="note"><b>Note:</b> Android Studio is required for Wear development.</p>
<ol>
<li>Start AVD Manager.</li>
<li>Update the Android SDK Tools and Platform-tools to versions 23 and 20 respectively.</li>
@@ -91,10 +91,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
+ services reference documentation for this preview release.</li>.
</ol>
-<p>Check out the <a href="/training/building-wearables">Building Apps for Wearables</a>
+<p>When you're done here, check out the <a href="{@docRoot}training/building-wearables">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 -->
diff --git a/docs/html/preview/material/index.jd b/docs/html/preview/material/index.jd
index d9a276f..9628e3a 100644
--- a/docs/html/preview/material/index.jd
+++ b/docs/html/preview/material/index.jd
@@ -1,5 +1,7 @@
page.title=Material Design
page.type=design
+page.image=images/material.png
+page.metaDescription=Learn how to apply material design to your apps.
@jd:body
diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index 39a5c69..3b7a7da 100644
--- a/docs/html/sdk/installing/studio.jd
+++ b/docs/html/sdk/installing/studio.jd
@@ -1,5 +1,7 @@
page.title=Android Studio
page.tags="studio"
+page.image=images/resource-card-android-studio.png
+page.metaDescription=Learn about the new features in the beta release of our new IDE.
@jd:body
diff --git a/docs/html/training/building-wearables.jd b/docs/html/training/building-wearables.jd
index 4fda10e..0745c93 100644
--- a/docs/html/training/building-wearables.jd
+++ b/docs/html/training/building-wearables.jd
@@ -1,5 +1,7 @@
page.title=Building Apps for Wearables
page.trainingcourse=true
+page.image=wear/images/notifications.png
+page.metaDescription=Learn how to build notifications, send and sync data, and use voice actions.
@jd:body
diff --git a/docs/html/training/wearables/apps/creating.jd b/docs/html/training/wearables/apps/creating.jd
index 145aed8..841f24a 100644
--- a/docs/html/training/wearables/apps/creating.jd
+++ b/docs/html/training/wearables/apps/creating.jd
@@ -13,7 +13,7 @@
</ol>
<h2>Dependencies and Prerequisites</h2>
<ul>
- <li>Android Studio 0.8 or later and Gradle 1.12 or later</li>
+ <li>Android Studio 0.8 or later and Gradle 0.12 or later</li>
</ul>
</div>
</div>
diff --git a/docs/html/training/wearables/apps/index.jd b/docs/html/training/wearables/apps/index.jd
index c2c7f39..3a4eb70 100644
--- a/docs/html/training/wearables/apps/index.jd
+++ b/docs/html/training/wearables/apps/index.jd
@@ -1,11 +1,13 @@
page.title=Creating Wearable Apps
+page.image=wear/images/notifications.png
+
@jd:body
<div id="tb-wrapper">
<div id="tb">
<h2>Dependencies and Prerequisites</h2>
<ul>
- <li>Android Studio 0.8 or later and Gradle 1.12 or later</li>
+ <li>Android Studio 0.8 or later and Gradle 0.12 or later</li>
</ul>
</div>
</div>
diff --git a/docs/html/training/wearables/apps/layouts.jd b/docs/html/training/wearables/apps/layouts.jd
index 983c359..4bf9cde 100644
--- a/docs/html/training/wearables/apps/layouts.jd
+++ b/docs/html/training/wearables/apps/layouts.jd
@@ -56,13 +56,16 @@
}
</pre>
</li>
- <li>Set the activity's <code>allowEmbedded</code> property to <code>true</code>
- in the wearable app's Android manifest. This allows an activity that you create in your wearable
- app to be displayed by the wearable's context stream process.</li>
+ <li>Define necessary properties for the activity in the Android manifest to allow
+ the activity to be displayed in the wearable's context stream process. You need to declare the
+ activity to be exportable, be embeddable, and have an empty task affinity. We also recommend
+ setting the theme to <code>Theme.DeviceDefault.Light</code>. For example:</li>
<pre>
-<activity android:allowEmbedded="true" ... >
-...
-</activity>
+<activity android:name="com.example.MyDisplayActivity"
+ android:exported="true"
+ android:allowEmbedded="true"
+ android:taskAffinity=""
+ android:theme="@android:style/Theme.DeviceDefault.Light" />
</pre>
</li>
<li>Create a {@link android.app.PendingIntent} for the activity that you want to display.
diff --git a/docs/html/training/wearables/notifications/pages.jd b/docs/html/training/wearables/notifications/pages.jd
index 1026774..d74c8ea 100644
--- a/docs/html/training/wearables/notifications/pages.jd
+++ b/docs/html/training/wearables/notifications/pages.jd
@@ -65,7 +65,7 @@
.build();
// Issue the notification
- notificationManager =
- NotificationManagerCompat.from(this);
- notificationManager.notify(notificationId, twoPageNotification);
+notificationManager =
+ NotificationManagerCompat.from(this);
+notificationManager.notify(notificationId, twoPageNotification);
</pre>
\ No newline at end of file
