diff --git a/docs/html/images/material.png b/docs/html/images/material.png new file mode 100644 index 0000000000000..981359bba7a08 Binary files /dev/null and b/docs/html/images/material.png 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 0000000000000..0f483df99b34a Binary files /dev/null and b/docs/html/images/resource-card-android-studio.png differ diff --git a/docs/html/index.jd b/docs/html/index.jd index c9efcb33a693b..253a7a57f3c36 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -14,21 +14,21 @@ page.customHeadTag=
-
-
-

-

L Developer Preview

- 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.


- Get Started +
+
+

L Developer Preview

+

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.

+ Learn More
-

 

-
@@ -36,7 +36,7 @@ page.customHeadTag= +
Get the SDK
diff --git a/docs/html/preview/google-play-services-wear.html b/docs/html/preview/google-play-services-wear.html index f225f7ae2bfbc..ff43757109a24 100644 --- a/docs/html/preview/google-play-services-wear.html +++ b/docs/html/preview/google-play-services-wear.html @@ -80,7 +80,7 @@ preferably from your mobile browser:

and handheld devices. To get the new SDK that is compatible with the Google Play services APK that you just installed, follow these steps:

-

Note: We highly recommend you use Android Studio for Wear development.

+

Note: Android Studio is required for Wear development.

  1. Start AVD Manager.
  2. Update the Android SDK Tools and Platform-tools to versions 23 and 20 respectively.
  3. @@ -91,10 +91,13 @@ APK that you just installed, follow these steps:

  4. 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.
  5. +
  6. Download the Google Play + services reference documentation for this preview release.
  7. .
-

Check out the Building Apps for Wearables +

When you're done here, check out the Building Apps for Wearables training classes for information on how to build for Wear.

+
diff --git a/docs/html/preview/material/index.jd b/docs/html/preview/material/index.jd index d9a276f70c638..9628e3ab796e4 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 39a5c6993c938..3b7a7da14f443 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 4fda10e1f960f..0745c93a015d6 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 145aed8bb6b6d..841f24a5a6d1f 100644 --- a/docs/html/training/wearables/apps/creating.jd +++ b/docs/html/training/wearables/apps/creating.jd @@ -13,7 +13,7 @@ page.title=Creating and Running a Wearable App

Dependencies and Prerequisites

diff --git a/docs/html/training/wearables/apps/index.jd b/docs/html/training/wearables/apps/index.jd index c2c7f397d6dad..3a4eb707ef7d1 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

Dependencies and Prerequisites

diff --git a/docs/html/training/wearables/apps/layouts.jd b/docs/html/training/wearables/apps/layouts.jd index 983c3592d73be..4bf9cde2046cb 100644 --- a/docs/html/training/wearables/apps/layouts.jd +++ b/docs/html/training/wearables/apps/layouts.jd @@ -56,13 +56,16 @@ public void onCreate(Bundle bundle){ } -
  • Set the activity's allowEmbedded property to true - 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.
  • +
  • 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 Theme.DeviceDefault.Light. For example:
  • -<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" />
     
  • 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 102677421814d..d74c8ea40b8ce 100644 --- a/docs/html/training/wearables/notifications/pages.jd +++ b/docs/html/training/wearables/notifications/pages.jd @@ -65,7 +65,7 @@ Notification twoPageNotification = .build(); // Issue the notification - notificationManager = - NotificationManagerCompat.from(this); - notificationManager.notify(notificationId, twoPageNotification); +notificationManager = + NotificationManagerCompat.from(this); +notificationManager.notify(notificationId, twoPageNotification); \ No newline at end of file