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

* commit '0b7e1bafe5e722bd8c620f8d404e39a2c37d893c':
  Moved TV Input Framework (TIF) page out of preview.
This commit is contained in:
Andrew Solovay
2014-10-16 18:59:59 +00:00
committed by Android Git Automerger
3 changed files with 10 additions and 7 deletions

View File

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 73 KiB

View File

@@ -919,6 +919,10 @@ include the action bar on devices running Android 2.1 or higher."
Building TV Games</a> Building TV Games</a>
</li> </li>
<li>
<a href="<?cs var:toroot ?>training/tv/tif/index.html">
TV Input Framework</a>
</li>
</ul> </ul>
</li> </li>
<!-- End: Building for TV --> <!-- End: Building for TV -->

View File

@@ -6,7 +6,8 @@ page.tags=tif
<p> <p>
Watching live television shows and other continuous, channel-based content is a big part of the 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 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 from hardware sources, such as HDMI ports and built-in-tuners, and software sources, such as
video streamed over the internet. video streamed over the internet.
</p> </p>
@@ -20,7 +21,7 @@ page.tags=tif
the TV app. the TV app.
</p> </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"> <p class="img-caption">
<strong>Figure 1.</strong> Functional diagram of the TV Input Framework <strong>Figure 1.</strong> Functional diagram of the TV Input Framework
</p> </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. Building a TV input service for your content can help make it more accessible on TV devices.
</p> </p>
<p> <p>For more information about TV Input Framework, see the
The APIs for the TV Input Framework are available in the L Developer Preview and you can <a href="{@docRoot}reference/android/media/tv/package-summary.html">android.media.tv</a>
review them in the preview API reference docs. However, more changes are planned, so stay tuned reference.</p>
for additional information with the official Android platform launch.
</p>