diff options
| author | Quddus Chong <quddusc@google.com> | 2015-06-17 16:36:17 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-17 16:36:17 +0000 |
| commit | 5c7b9495fbf95a87c6dd85bdbd170aa35483f004 (patch) | |
| tree | f42d2b0db08e2ba977f8dd3659ba6f8fbfc6dc3e /docs/html/training | |
| parent | 13e54ff0ebc5fe6f425c16d9d30ea9ecd5db1348 (diff) | |
| parent | 93bd81346de88f850f4e4002229a3119c97d8ddb (diff) | |
| download | frameworks_base-5c7b9495fbf95a87c6dd85bdbd170aa35483f004.zip frameworks_base-5c7b9495fbf95a87c6dd85bdbd170aa35483f004.tar.gz frameworks_base-5c7b9495fbf95a87c6dd85bdbd170aa35483f004.tar.bz2 | |
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 '93bd81346de88f850f4e4002229a3119c97d8ddb':
docs: Updated Android TV landing page and Live TV training to support channels. bug: 21786387
Diffstat (limited to 'docs/html/training')
| -rw-r--r-- | docs/html/training/training_toc.cs | 4 | ||||
| -rw-r--r-- | docs/html/training/tv/tif/index.jd | 19 |
2 files changed, 14 insertions, 9 deletions
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs index ccefe72..e1e6838 100644 --- a/docs/html/training/training_toc.cs +++ b/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."> - Building Live TV Apps</a> + description="How to build channels for TV."> + Building TV Channels</a> </div> <ul> <li> diff --git a/docs/html/training/tv/tif/index.jd b/docs/html/training/tv/tif/index.jd index 5739294..92b6139 100644 --- a/docs/html/training/tv/tif/index.jd +++ b/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 - 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. +Watching live TV shows and other continuous, channel-based content is a big part of the TV +experience. Users are accustomed to selecting and watching shows on TV by channel browsing. +To provide your users a similar experience, use the TV Input Framework to create channels for +publishing video or music content so that your media appears alongside traditional TV channels in +the programming guide. +</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 |