diff options
author | Robert Ly <robertly@google.com> | 2014-06-25 07:17:13 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-25 03:38:12 +0000 |
commit | 6e35f209d62eb814383ae22e96384a55b5e3387e (patch) | |
tree | 0e48f27779fb4f922f359d464b076b3d2e5fc97a | |
parent | 0ac4b32d58e411244dbea77e02950b569b7ecd69 (diff) | |
parent | 7aae4d4f58ada61c349d8c56b8548e482fd56f09 (diff) | |
download | frameworks_base-6e35f209d62eb814383ae22e96384a55b5e3387e.zip frameworks_base-6e35f209d62eb814383ae22e96384a55b5e3387e.tar.gz frameworks_base-6e35f209d62eb814383ae22e96384a55b5e3387e.tar.bz2 |
Merge "docs:wear landing and training fixes" into klp-modular-dev
22 files changed, 35 insertions, 33 deletions
diff --git a/docs/html/images/home/auto-wordmark.png b/docs/html/images/home/auto-wordmark.png Binary files differnew file mode 100644 index 0000000..027dfca --- /dev/null +++ b/docs/html/images/home/auto-wordmark.png diff --git a/docs/html/images/home/auto.png b/docs/html/images/home/auto.png Binary files differindex 7ea01b0..4ce882a 100644 --- a/docs/html/images/home/auto.png +++ b/docs/html/images/home/auto.png diff --git a/docs/html/images/home/tv-wordmark.png b/docs/html/images/home/tv-wordmark.png Binary files differnew file mode 100644 index 0000000..e7660ac --- /dev/null +++ b/docs/html/images/home/tv-wordmark.png diff --git a/docs/html/images/home/tv.png b/docs/html/images/home/tv.png Binary files differindex 3cf2034..7208a99 100644 --- a/docs/html/images/home/tv.png +++ b/docs/html/images/home/tv.png diff --git a/docs/html/images/home/wear-wordmark.png b/docs/html/images/home/wear-wordmark.png Binary files differnew file mode 100644 index 0000000..e645887 --- /dev/null +++ b/docs/html/images/home/wear-wordmark.png diff --git a/docs/html/images/home/wear.png b/docs/html/images/home/wear.png Binary files differindex dfaded7..e6602fd 100644 --- a/docs/html/images/home/wear.png +++ b/docs/html/images/home/wear.png diff --git a/docs/html/index.jd b/docs/html/index.jd index 2f01538..f101ad2 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -65,20 +65,22 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3 and it now supports these exciting, new form-factors. </div> </div> - <div class="landing-body" style="margin-top: 80px;"> + <div class="landing-body" style="margin-top: 50px;"> <div class="landing-breakout cols"> <div class="col-3-wide"> + <img src="{@docRoot}images/home/wear-wordmark.png" /> <img src="{@docRoot}images/home/wear.png"> - <p class="landing-small" style="margin-top:30px"> + <p class="landing-small"> Provide information on-the-go for your users, whenever they need it. </p> <p class="landing-small"> <a href="{@docRoot}wear/index.html">Learn about Android Wear</a> </p> </div> - <div class="col-3-wide"> + <div class="col-3-wide"> + <img src="{@docRoot}images/home/tv-wordmark.png" /> <img src="{@docRoot}images/home/tv.png"> - <p class="landing-small" style="margin-top:30px"> + <p class="landing-small" > Build your apps for the big screen and bring your content to life. </p> <p class="landing-small"> @@ -86,9 +88,10 @@ page.customHeadTag=<meta name="google-site-verification" content="sa-bIAI6GKvct3 </p> </div> - <div class="col-3-wide"> + <div class="col-3-wide"> + <img src="{@docRoot}images/home/auto-wordmark.png" /> <img src="{@docRoot}images/home/auto.png"> - <p class="landing-small" style="margin-top:30px"> + <p class="landing-small"> Extend your music apps to automobile entertainment systems. </p> diff --git a/docs/html/training/wearables/notifications/creating.jd b/docs/html/training/wearables/notifications/creating.jd index 174cd82..a61fa07 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. <p class="note"><strong>Note:</strong> Notifications using {@link android.widget.RemoteViews} are stripped of custom layouts and the wearable only displays the text and icons. However, you can create -<a href="{@docRoot}training/wearable/apps/custom-notifications.html">create custom notifications</a> +<a href="{@docRoot}training/wearables/apps/layouts.html#CustomNotifications">create custom notifications</a> that use custom card layouts by creating a wearable app that runs on the wearable device.</p> </div> @@ -123,7 +123,7 @@ the associated intent is invoked on the handheld.</p> <p class="note"><strong>Tip:</strong> 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 - <a href="{@docRoot}training/wearables/notifications/remote-input.html">Receiving Remote Input from + <a href="{@docRoot}training/wearables/notifications/voice-input.html">Receiving Voice Input from a Notification</a>. </p> diff --git a/docs/html/training/wearables/notifications/index.jd b/docs/html/training/wearables/notifications/index.jd index b9ed6fb..17f3cb3 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 Notifications <h2>Dependencies and prerequisites</h2> <ul> - <li>Android 1.6 (API Level 4) or higher on the handset device</li> + <li>Android 4.3 (API Level 18) or higher on the handset device</li> <li>An Android Wear device or Wear AVD</li> <li><a href="{@docRoot}tools/support-library/features.html#v4">The Android v4 support library (or v13, which includes v4)</li> @@ -36,8 +36,8 @@ create notifications that are catered for handhelds and wearables at the same ti <dl> <dt><a href="{@docRoot}training/wearables/notifications/creating.html">Creating a notification</a></dt> <dd>Learn how to create notifications with wearable features with the Android support library.</dd> - <dt><a href="{@docRoot}training/wearables/notifications/remote-input.html">Receiving Remote Input -from a Notification</a></dt> + <dt><a href="{@docRoot}training/wearables/notifications/voice-input.html">Receiving Voice Input +in a Notification</a></dt> <dd>Learn how to add an action to a wearable notification that receives voice input from users and delivers the transcribed message to your handset app.</dd> <dt><a href="{@docRoot}training/wearables/notifications/pages.html">Adding Pages to a Notification</a></dt> diff --git a/docs/html/training/wearables/notifications/voice-input.jd b/docs/html/training/wearables/notifications/voice-input.jd index 976bd86..4a27826 100644 --- a/docs/html/training/wearables/notifications/voice-input.jd +++ b/docs/html/training/wearables/notifications/voice-input.jd @@ -35,7 +35,7 @@ style="float:right;margin:0 0 20px 40px" /> using the emulator for a wearable device, enable <b>Hardware keyboard present</b> in the AVD settings so you can type replies instead.</p> -<h2 id="RemoteInput">Define the Voice Input</h2> +<h2 id="VoiceInput">Define the Voice Input</h2> <p>To 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 Binary files differnew file mode 100644 index 0000000..dbbb5e5 --- /dev/null +++ b/docs/html/wear/images/features/apps.png diff --git a/docs/html/wear/images/features/notifications.png b/docs/html/wear/images/features/notifications.png Binary files differnew file mode 100644 index 0000000..128853c --- /dev/null +++ b/docs/html/wear/images/features/notifications.png diff --git a/docs/html/wear/images/features/s1.png b/docs/html/wear/images/features/s1.png Binary files differdeleted file mode 100644 index ba96cf8..0000000 --- a/docs/html/wear/images/features/s1.png +++ /dev/null diff --git a/docs/html/wear/images/features/s2.png b/docs/html/wear/images/features/s2.png Binary files differdeleted file mode 100644 index af28496..0000000 --- a/docs/html/wear/images/features/s2.png +++ /dev/null diff --git a/docs/html/wear/images/features/s3.png b/docs/html/wear/images/features/s3.png Binary files differdeleted file mode 100644 index 6ae9868..0000000 --- a/docs/html/wear/images/features/s3.png +++ /dev/null diff --git a/docs/html/wear/images/features/s4.png b/docs/html/wear/images/features/s4.png Binary files differdeleted file mode 100644 index 125713d..0000000 --- a/docs/html/wear/images/features/s4.png +++ /dev/null diff --git a/docs/html/wear/images/features/send-data.png b/docs/html/wear/images/features/send-data.png Binary files differnew file mode 100644 index 0000000..7010e3f --- /dev/null +++ b/docs/html/wear/images/features/send-data.png diff --git a/docs/html/wear/images/features/ts1.png b/docs/html/wear/images/features/ts1.png Binary files differdeleted file mode 100644 index 5d4b1c1..0000000 --- a/docs/html/wear/images/features/ts1.png +++ /dev/null diff --git a/docs/html/wear/images/features/ts2.png b/docs/html/wear/images/features/ts2.png Binary files differdeleted file mode 100644 index dc798c5..0000000 --- a/docs/html/wear/images/features/ts2.png +++ /dev/null diff --git a/docs/html/wear/images/features/ts3.png b/docs/html/wear/images/features/ts3.png Binary files differdeleted file mode 100644 index 0d68ebc..0000000 --- a/docs/html/wear/images/features/ts3.png +++ /dev/null diff --git a/docs/html/wear/images/features/ts4.png b/docs/html/wear/images/features/voice.png Binary files differindex e727ab5..e727ab5 100644 --- a/docs/html/wear/images/features/ts4.png +++ b/docs/html/wear/images/features/voice.png diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd index bc08aa0..10e7d29 100644 --- a/docs/html/wear/index.jd +++ b/docs/html/wear/index.jd @@ -124,15 +124,15 @@ page.type=about <div class="landing-section-header"> <div class="landing-h1">Developing for Android Wear</div> <div class="landing-subhead"> - The Android Wear APIs are delivered in the Android v4 support library and Google Play services. - This lets Android handhelds, old and new, communicate with Android wearables. - </div> + The Android Wear APIs are delivered in the Android Support Library and Google Play + services. When using these libraries, handheld devices running Android 4.3 + (API Level 18) or later can communicate with wearables.</div> </div> <div class="landing-body"> <div class="landing-breakout cols"> <div class="col-4"> - <img src="{@docRoot}wear/images/features/ts2.png" alt=""> + <img src="{@docRoot}wear/images/features/notifications.png" alt=""> <p>Synced Notifications</p> <p class="landing-small"> Notifications on handhelds can automatically sync to wearables, so design them @@ -143,20 +143,30 @@ page.type=about </p> </div> <div class="col-4"> - <img src="{@docRoot}wear/images/features/ts1.png" alt=""> - <p>Wearable Apps</p> + <img src="{@docRoot}wear/images/features/voice.png" alt=""> + <p>Voice Actions</p> + <p class="landing-small"> + Register your app to handle voice actions, like "Ok Google, take a note," + for a hands-free experience. + </p> + <p class="landing-small"> + <a href="{@docRoot}training/wearables/apps/voice-actions.html">Integrate voice actions</a> + </p> + </div> + <div class="col-4"> + <img src="{@docRoot}wear/images/features/apps.png" alt=""> + <p>Build Wearable Apps</p> <p class="landing-small"> Create custom experiences with activities, services, sensors, and much more with the Android SDK. </p> <p class="landing-small"> <a href="{@docRoot}training/wearables/apps/index.html">Create wearable apps</a> - </p> </div> <div class="col-4"> - <img src="{@docRoot}wear/images/features/ts2.png" alt=""> - <p>Send Data</p> + <img src="{@docRoot}wear/images/features/send-data.png" alt=""> + <p>Synced Data</p> <p class="landing-small"> Send data and actions between handhelds and wearables with data replication APIs and RPCs. @@ -166,17 +176,6 @@ page.type=about </p> </div> - <div class="col-4"> - <img src="{@docRoot}wear/images/features/ts4.png" alt=""> - <p>Voice Actions</p> - <p class="landing-small"> - Register your app to handle voice actions, like "Ok Google, take a note," - for a hands-free experience. - </p> - <p class="landing-small"> - <a href="{@docRoot}training/wearables/apps/voice-actions.html">Integrate voice actions</a> - </p> - </div> </div> </div> </div> <!-- end .wrap --> @@ -185,7 +184,7 @@ page.type=about <div class="landing-section landing-white-background"> <div class="wrap"> <div class="landing-section-header"> - <div class="landing-h2">Building an Ecosystem</div> + <div class="landing-h1">Building an Ecosystem</div> <div class="landing-body landing-align-center"> <p class="landing-small"> We’re working with partners around the world to build watches powered by Android Wear! |