Merge "docs:wear landing and training fixes" into klp-modular-dev

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>

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>
 

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>

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.

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,31 +143,7 @@ page.type=about
                 </p>
               </div>
               <div class="col-4">
-                <img src="{@docRoot}wear/images/features/ts1.png" alt="">
-                <p>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>
-                <p class="landing-small">
-                  Send data and actions between handhelds and wearables with
-                  data replication APIs and RPCs.
-                </p>
-                <p class="landing-small">
-                  <a href="{@docRoot}training/wearables/data-layer/index.html">Work with the Data Layer</a>
-
-                </p>
-              </div>
-              <div class="col-4">
-                <img src="{@docRoot}wear/images/features/ts4.png" alt="">
+                <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&nbsp;note,"
@@ -177,6 +153,29 @@ page.type=about
                   <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/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.
+                </p>
+                <p class="landing-small">
+                  <a href="{@docRoot}training/wearables/data-layer/index.html">Work with the Data Layer</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!