3 files changed, 42 insertions, 1 deletions
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index 12685ba..03fb812 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -919,6 +919,10 @@ include the action bar on devices running Android 2.1 or higher."
            Building TV Games</a>
       </li>
 
+      <li>
+        <a href="<?cs var:toroot ?>training/tv/tif/index.html">
+          TV Input Framework</a>
+      </li>
     </ul>
   </li>
   <!-- End: Building for TV -->
diff --git a/docs/html/training/tv/tif/index.jd b/docs/html/training/tv/tif/index.jd
new file mode 100644
index 0000000..aac640c
--- /dev/null
+++ b/docs/html/training/tv/tif/index.jd
@@ -0,0 +1,37 @@
+page.title=TV Input Framework
+page.tags=tif
+
+@jd:body
+
+<p>
+  Watching live television shows and other continuous, channel-based content is a big part of the
+  TV experience. Android supports receiving and playback of live video content through the TV Input
+  Framework in Android 5.0 (API level 21).
+  This framework provides a unified method for receiving audio and video channel content
+  from hardware sources, such as HDMI ports and built-in-tuners, and software sources, such as
+  video streamed over the internet.
+</p>
+<p>
+  The framework enables developers to define live TV input sources by implementing a TV input
+  service. This service publishes a list of channels and programs to the TV Provider. The live TV
+  app on a TV device gets the list of available channels and programs from the TV Provider and
+  displays them to a user. When a user selects a specific channel, the live TV app creates a
+  session for the associated TV input service through the TV Input Manager, and tells the TV input
+  service to tune to the requested channel and play the content to a display surface provided by
+  the TV app.
+</p>
+
+<img src="{@docRoot}images/tv/tv-tif-overview.png" id="figure1">
+<p class="img-caption">
+  <strong>Figure 1.</strong> Functional diagram of the TV Input Framework
+</p>
+
+<p>
+  The TV Input Framework is designed to provide access to a wide variety of live TV input sources
+  and bring them together in a single user interface for users to browse, view, and enjoy content.
+  Building a TV input service for your content can help make it more accessible on TV devices.
+</p>
+
+<p>For more information about TV Input Framework, see the
+<a href="{@docRoot}reference/android/media/tv/package-summary.html">android.media.tv</a>
+reference.</p>
diff --git a/docs/html/training/wearables/notifications/creating.jd b/docs/html/training/wearables/notifications/creating.jd
index 9398f96..84e3311 100644
--- a/docs/html/training/wearables/notifications/creating.jd
+++ b/docs/html/training/wearables/notifications/creating.jd
@@ -155,7 +155,7 @@ PendingIntent actionPendingIntent =
 // Create the action
 NotificationCompat.Action action =
         new NotificationCompat.Action.Builder(R.drawable.ic_action,
-                getString(R.string.label, actionPendingIntent))
+                getString(R.string.label), actionPendingIntent)
                 .build();
 
 // Build the notification and add the action via WearableExtender