am 5c7b9495: am 93bd8134: am eae09b4a: Merge "docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387" into mnc-preview-docs

* commit '5c7b9495fbf95a87c6dd85bdbd170aa35483f004':
  docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387

docs/html/training/training_toc.cs

@@ -1023,8 +1023,8 @@ include the action bar on devices running Android 2.1 or higher."
       <li class="nav-section">
         <div class="nav-section-header">
           <a href="<?cs var:toroot ?>training/tv/tif/index.html"
-           description="How to build Live TV apps.">
+           description="How to build channels for TV.">
-           Building Live TV Apps</a>
+           Building TV Channels</a>
         </div>
         <ul>
           <li>

docs/html/training/tv/tif/index.jd

@@ -1,4 +1,4 @@
-page.title=Building Live TV Apps
+page.title=Building TV Channels
 page.tags=tv, tif
 helpoutsWidget=true
 startpage=true
@@ -25,12 +25,17 @@ startpage=true
 </div>
 
 <p>
-  Watching live television shows and other continuous, channel-based content is a big part of the
+Watching live TV shows and other continuous, channel-based content is a big part of the TV
-  TV experience. Android supports receiving and playback of live video content through the TV Input
+experience. Users are accustomed to selecting and watching shows on TV by channel browsing.
-  Framework in Android 5.0 (API level 21).
+To provide your users a similar experience, use the TV Input Framework to create channels for
-  This framework provides a unified method for receiving audio and video channel content
+publishing video or music content so that your media appears alongside traditional TV channels in
-  from hardware sources, such as HDMI ports and built-in-tuners, and software sources, such as
+the programming guide.
-  video streamed over the internet.
+</p>
+<p>
+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

docs/html/tv/index.jd

@@ -145,6 +145,36 @@ page.type=about
         </div>  <!-- end .wrap -->
       </div> <!-- end .landing-section -->
 
+      <div class="landing-section" style="background-color:#f5f5f5" id="tv-games-channels">
+        <div class="wrap">
+          <div class="landing-section-header">
+            <div class="landing-h1">Develop Games and Channels</div>
+          </div>
+
+          <div class="landing-body">
+            <div class="cols">
+              <div class="col-8">
+                <div class="landing-h3">Play Games on TV</div>
+                <p class="landing-small" style="padding-left:0px; padding-top:15px;">
+                  Build apps that let users experience high-performance gaming in leanback mode.
+                  Users can discover your apps easily through the Games row in the Android TV
+                  Launcher.<br>
+                <a href="{@docRoot}training/tv/games/index.html">Learn how to build games for TV</a>
+                </p>
+              </div>
+              <div class="col-8">
+                <div class="landing-h3">Keep Users Engaged with Channels</div>
+                <p class="landing-small" style="padding-left:0px; padding-top:15px;">
+                  Create apps that serve video and music content in a linear, channel-like
+                  fashion to users. Users see your channels alongside traditional TV channels in the
+                  programming guide.<br>
+                <a href="{@docRoot}training/tv/tif/index.html">Learn how to build channels</a>
+                </p>
+              </div>
+            </div>
+          </div>
+        </div> <!-- end .wrap -->
+      </div> <!-- end .landing-section -->
 
       <div class="landing-section landing-red-background">
         <div class="wrap">