diff --git a/docs/html/images/home/auto-wordmark.png b/docs/html/images/home/auto-wordmark.png new file mode 100644 index 0000000000000..027dfca4e8abb Binary files /dev/null and b/docs/html/images/home/auto-wordmark.png differ diff --git a/docs/html/images/home/auto.png b/docs/html/images/home/auto.png index 7ea01b09ae0c3..4ce882ab01fcb 100644 Binary files a/docs/html/images/home/auto.png and b/docs/html/images/home/auto.png differ diff --git a/docs/html/images/home/tv-wordmark.png b/docs/html/images/home/tv-wordmark.png new file mode 100644 index 0000000000000..e7660acda923c Binary files /dev/null and b/docs/html/images/home/tv-wordmark.png differ diff --git a/docs/html/images/home/tv.png b/docs/html/images/home/tv.png index 3cf2034d7e7bc..7208a99f3688b 100644 Binary files a/docs/html/images/home/tv.png and b/docs/html/images/home/tv.png differ diff --git a/docs/html/images/home/wear-wordmark.png b/docs/html/images/home/wear-wordmark.png new file mode 100644 index 0000000000000..e645887a9f919 Binary files /dev/null and b/docs/html/images/home/wear-wordmark.png differ diff --git a/docs/html/images/home/wear.png b/docs/html/images/home/wear.png index dfaded7310d5f..e6602fdde7ac6 100644 Binary files a/docs/html/images/home/wear.png and b/docs/html/images/home/wear.png differ diff --git a/docs/html/index.jd b/docs/html/index.jd index 2f015388e0a80..f101ad22adadf 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -65,20 +65,22 @@ page.customHeadTag= +
- +
Build your apps for the big screen and bring your content to life.
@@ -86,9 +88,10 @@ page.customHeadTag= +
- +
Extend your music apps to automobile entertainment systems.
diff --git a/docs/html/training/wearables/notifications/creating.jd b/docs/html/training/wearables/notifications/creating.jd index 174cd82cd977a..a61fa07e39284 100644 --- a/docs/html/training/wearables/notifications/creating.jd +++ b/docs/html/training/wearables/notifications/creating.jd @@ -28,7 +28,7 @@ notifications properly, whether they appear on a handheld or wearable.Note: Notifications using {@link android.widget.RemoteViews} are stripped of custom layouts and the wearable only displays the text and icons. However, you can create -create custom notifications +create custom notifications that use custom card layouts by creating a wearable app that runs on the wearable device.
Tip: If your notifications include a "Reply" action (such as for a messaging app), you can enhance the behavior by enabling voice input replies directly from the Android wearable. For more information, read - Receiving Remote Input from + Receiving Voice Input from a Notification.
diff --git a/docs/html/training/wearables/notifications/index.jd b/docs/html/training/wearables/notifications/index.jd index b9ed6fb9b9262..17f3cb3c57d44 100644 --- a/docs/html/training/wearables/notifications/index.jd +++ b/docs/html/training/wearables/notifications/index.jd @@ -6,7 +6,7 @@ page.title=Adding Wearable Features to NotificationsTo create an action that supports voice input, create an instance of {@link android.support.v4.app.RemoteInput.Builder} that you can add to your notification action. diff --git a/docs/html/wear/images/features/apps.png b/docs/html/wear/images/features/apps.png new file mode 100644 index 0000000000000..dbbb5e54bb6ff Binary files /dev/null and b/docs/html/wear/images/features/apps.png differ diff --git a/docs/html/wear/images/features/notifications.png b/docs/html/wear/images/features/notifications.png new file mode 100644 index 0000000000000..128853cf07648 Binary files /dev/null and b/docs/html/wear/images/features/notifications.png differ diff --git a/docs/html/wear/images/features/s1.png b/docs/html/wear/images/features/s1.png deleted file mode 100644 index ba96cf8e59e22..0000000000000 Binary files a/docs/html/wear/images/features/s1.png and /dev/null differ diff --git a/docs/html/wear/images/features/s2.png b/docs/html/wear/images/features/s2.png deleted file mode 100644 index af28496e550c7..0000000000000 Binary files a/docs/html/wear/images/features/s2.png and /dev/null differ diff --git a/docs/html/wear/images/features/s3.png b/docs/html/wear/images/features/s3.png deleted file mode 100644 index 6ae9868d99eda..0000000000000 Binary files a/docs/html/wear/images/features/s3.png and /dev/null differ diff --git a/docs/html/wear/images/features/s4.png b/docs/html/wear/images/features/s4.png deleted file mode 100644 index 125713d00e063..0000000000000 Binary files a/docs/html/wear/images/features/s4.png and /dev/null differ diff --git a/docs/html/wear/images/features/send-data.png b/docs/html/wear/images/features/send-data.png new file mode 100644 index 0000000000000..7010e3f0c842b Binary files /dev/null and b/docs/html/wear/images/features/send-data.png differ diff --git a/docs/html/wear/images/features/ts1.png b/docs/html/wear/images/features/ts1.png deleted file mode 100644 index 5d4b1c1555bd6..0000000000000 Binary files a/docs/html/wear/images/features/ts1.png and /dev/null differ diff --git a/docs/html/wear/images/features/ts2.png b/docs/html/wear/images/features/ts2.png deleted file mode 100644 index dc798c5d1a2b3..0000000000000 Binary files a/docs/html/wear/images/features/ts2.png and /dev/null differ diff --git a/docs/html/wear/images/features/ts3.png b/docs/html/wear/images/features/ts3.png deleted file mode 100644 index 0d68ebc839d7e..0000000000000 Binary files a/docs/html/wear/images/features/ts3.png and /dev/null differ diff --git a/docs/html/wear/images/features/ts4.png b/docs/html/wear/images/features/voice.png similarity index 100% rename from docs/html/wear/images/features/ts4.png rename to docs/html/wear/images/features/voice.png diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd index bc08aa00e8657..10e7d29b6d6b4 100644 --- a/docs/html/wear/index.jd +++ b/docs/html/wear/index.jd @@ -124,15 +124,15 @@ page.type=about
+
Synced Notifications
Notifications on handhelds can automatically sync to wearables, so design them @@ -143,31 +143,7 @@ page.type=about
- Wearable Apps
-- Create custom experiences with activities, services, sensors, and much - more with the Android SDK. -
-- Create wearable apps - -
-
- Send Data
-- Send data and actions between handhelds and wearables with - data replication APIs and RPCs. -
-- Work with the Data Layer - -
-
+
Voice Actions
Register your app to handle voice actions, like "Ok Google, take a note," @@ -177,6 +153,29 @@ page.type=about Integrate voice actions
+ Build Wearable Apps
++ Create custom experiences with activities, services, sensors, and much + more with the Android SDK. +
+ +
+ Synced Data
++ Send data and actions between handhelds and wearables with + data replication APIs and RPCs. +
++ Work with the Data Layer + +
+We’re working with partners around the world to build watches powered by Android Wear!