From bab257453bdc0c8b7f11de88dd7a8f8fa202803f Mon Sep 17 00:00:00 2001
From: Andrew Solovay <asolovay@google.com>
Date: Fri, 10 Oct 2014 15:30:53 -0700
Subject: [PATCH] Moved TV Input Framework (TIF) page out of preview.

See first comment on CL for the doc staging location. Setting up a
redirect for the old page with CL http://ag/566783

Change-Id: Ibd391cb3fe357495ecf3dc70b1edeadee12075f3
---
 .../tv/tv-tif-overview.png}                        | Bin
 docs/html/training/training_toc.cs                 |   4 ++++
 docs/html/{preview => training}/tv/tif/index.jd    |  13 ++++++-------
 3 files changed, 10 insertions(+), 7 deletions(-)
 rename docs/html/{preview/tv/images/tif-overview.png => images/tv/tv-tif-overview.png} (100%)
 rename docs/html/{preview => training}/tv/tif/index.jd (76%)

diff --git a/docs/html/preview/tv/images/tif-overview.png b/docs/html/images/tv/tv-tif-overview.png
similarity index 100%
rename from docs/html/preview/tv/images/tif-overview.png
rename to docs/html/images/tv/tv-tif-overview.png
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index 12685ba39143e..03fb8123e72a3 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/preview/tv/tif/index.jd b/docs/html/training/tv/tif/index.jd
similarity index 76%
rename from docs/html/preview/tv/tif/index.jd
rename to docs/html/training/tv/tif/index.jd
index ef02defe72fa2..aac640cae91fe 100644
--- a/docs/html/preview/tv/tif/index.jd
+++ b/docs/html/training/tv/tif/index.jd
@@ -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>