Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11014fea authored by Andrew Solovay's avatar Andrew Solovay Committed by Android Git Automerger
Browse files

am 0b7e1baf: am 34ef4ff9: Merge "Moved TV Input Framework (TIF) page out of preview." into lmp-dev 

* commit '0b7e1baf':
  Moved TV Input Framework (TIF) page out of preview.
parents f83c56cd 0b7e1baf

docs/html/training/training_toc.cs

+4 −0
Original line number Diff line number Diff line
@@ -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 -->

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

+6 −7
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ page.tags=tif 
<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. This framework provides a unified method for receiving audio and video channel content

  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>
@@ -20,7 +21,7 @@ page.tags=tif 
  the TV app.

</p>



<img src="{@docRoot}preview/tv/images/tif-overview.png" id="figure1">

<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>
@@ -31,8 +32,6 @@ page.tags=tif 
  Building a TV input service for your content can help make it more accessible on TV devices.

</p>



<p>

  The APIs for the TV Input Framework are available in the L Developer Preview and you can

  review them in the preview API reference docs. However, more changes are planned, so stay tuned

  for additional information with the official Android platform launch.

</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>