summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2014-10-17 00:01:58 -0700
committerJoe Fernandez <joefernandez@google.com>2014-10-17 00:35:50 -0700
commit7213656f986f5713c46ce5e86f8b8f569640275b (patch)
tree2fa45f217634ead5f5b81fa1e6a90da7e18679a6 /docs
parentdd88668392839509c812a544b1132185b3825b69 (diff)
downloadframeworks_base-7213656f986f5713c46ce5e86f8b8f569640275b.zip
frameworks_base-7213656f986f5713c46ce5e86f8b8f569640275b.tar.gz
frameworks_base-7213656f986f5713c46ce5e86f8b8f569640275b.tar.bz2
docs: Android TV docs fixes for L SDK release
Change-Id: Ie37c2056844e1c04542ed4e556a6577640e13819
Diffstat (limited to 'docs')
-rw-r--r--docs/html/design/tv/images/apps-games-rows.jpgbin82048 -> 128838 bytes
-rw-r--r--docs/html/design/tv/images/atv-home.jpgbin197369 -> 127249 bytes
-rw-r--r--docs/html/design/tv/images/recommendations.pngbin237004 -> 260267 bytes
-rw-r--r--docs/html/design/tv/images/settings.jpgbin19094 -> 31264 bytes
-rw-r--r--docs/html/images/tv/home-recommendations.png (renamed from docs/html/preview/tv/images/home-recommendations.png)bin297797 -> 297797 bytes
-rw-r--r--docs/html/training/training_toc.cs7
-rw-r--r--docs/html/training/tv/discovery/recommendations.jd2
-rw-r--r--docs/html/training/tv/tif/index.jd2
-rw-r--r--docs/html/tv/images/atv-framed.pngbin537558 -> 1442987 bytes
9 files changed, 6 insertions, 5 deletions
diff --git a/docs/html/design/tv/images/apps-games-rows.jpg b/docs/html/design/tv/images/apps-games-rows.jpg
index 5023655..d18ac6a 100644
--- a/docs/html/design/tv/images/apps-games-rows.jpg
+++ b/docs/html/design/tv/images/apps-games-rows.jpg
Binary files differ
diff --git a/docs/html/design/tv/images/atv-home.jpg b/docs/html/design/tv/images/atv-home.jpg
index 4b25bab..6040a49 100644
--- a/docs/html/design/tv/images/atv-home.jpg
+++ b/docs/html/design/tv/images/atv-home.jpg
Binary files differ
diff --git a/docs/html/design/tv/images/recommendations.png b/docs/html/design/tv/images/recommendations.png
index 942cd10..fb6562f 100644
--- a/docs/html/design/tv/images/recommendations.png
+++ b/docs/html/design/tv/images/recommendations.png
Binary files differ
diff --git a/docs/html/design/tv/images/settings.jpg b/docs/html/design/tv/images/settings.jpg
index 1c5bf31..d96fed4 100644
--- a/docs/html/design/tv/images/settings.jpg
+++ b/docs/html/design/tv/images/settings.jpg
Binary files differ
diff --git a/docs/html/preview/tv/images/home-recommendations.png b/docs/html/images/tv/home-recommendations.png
index ef97145..ef97145 100644
--- a/docs/html/preview/tv/images/home-recommendations.png
+++ b/docs/html/images/tv/home-recommendations.png
Binary files differ
diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs
index 8b233a3..0fee771 100644
--- a/docs/html/training/training_toc.cs
+++ b/docs/html/training/training_toc.cs
@@ -902,7 +902,7 @@ 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/discovery/index.html"
- description="How to help users discovery content from your app.">
+ description="How to help users discover content from your app.">
Helping Users Find Content on TV</a>
</div>
<ul>
@@ -924,8 +924,9 @@ include the action bar on devices running Android 2.1 or higher."
</li>
<li>
- <a href="<?cs var:toroot ?>training/tv/tif/index.html">
- TV Input Framework</a>
+ <a href="<?cs var:toroot ?>training/tv/tif/index.html"
+ description="How to build Live TV apps.">
+ Building Live TV Apps</a>
</li>
</ul>
</li>
diff --git a/docs/html/training/tv/discovery/recommendations.jd b/docs/html/training/tv/discovery/recommendations.jd
index 048b649..a6eb152 100644
--- a/docs/html/training/tv/discovery/recommendations.jd
+++ b/docs/html/training/tv/discovery/recommendations.jd
@@ -29,7 +29,7 @@ trainingnavtop=true
bring users back to your app.
</p>
-<img src="{@docRoot}preview/tv/images/home-recommendations.png" alt="" id="figure1" />
+<img src="{@docRoot}images/tv/home-recommendations.png" alt="" id="figure1" />
<p class="img-caption">
<strong>Figure 1.</strong> An example of the recommendations row.
</p>
diff --git a/docs/html/training/tv/tif/index.jd b/docs/html/training/tv/tif/index.jd
index aac640c..dc191f9 100644
--- a/docs/html/training/tv/tif/index.jd
+++ b/docs/html/training/tv/tif/index.jd
@@ -1,4 +1,4 @@
-page.title=TV Input Framework
+page.title=Building Live TV Apps
page.tags=tif
@jd:body
diff --git a/docs/html/tv/images/atv-framed.png b/docs/html/tv/images/atv-framed.png
index bec27e8..947f94e 100644
--- a/docs/html/tv/images/atv-framed.png
+++ b/docs/html/tv/images/atv-framed.png
Binary files differ