summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorJoe Malin <jmalin@google.com>2011-07-08 17:53:09 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2011-07-08 17:53:09 -0700
commit6737441c1736607b35f40cdd5b6126f7a0c912dc (patch)
tree0e0f9b1080b6eb2e1b8e21cbb61fa4d95f65e7a0 /docs
parentc020d7b4740aff3aca2867c197f83ebdee572212 (diff)
parentf84bb997717501e0af8672608c9d5bd89abe5334 (diff)
downloadframeworks_base-6737441c1736607b35f40cdd5b6126f7a0c912dc.zip
frameworks_base-6737441c1736607b35f40cdd5b6126f7a0c912dc.tar.gz
frameworks_base-6737441c1736607b35f40cdd5b6126f7a0c912dc.tar.bz2
am f84bb997: am 230ef987: am 0e89d916: Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
* commit 'f84bb997717501e0af8672608c9d5bd89abe5334': DOC CHANGE: Change GTV info on intro page
Diffstat (limited to 'docs')
-rw-r--r--docs/html/index.jd19
1 files changed, 9 insertions, 10 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd
index eeeedd0..dce46f9 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -148,19 +148,18 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
'tv': {
'layout':"imgLeft",
- 'icon':"tv_s.png",
+ 'icon':"GTV_icon_small.png",
'name':"Google TV",
- 'img':"tv_l.png",
- 'title':"Announcing Google TV!",
- 'desc': "<p><a href='http://www.google.com/tv/'>Google TV</a> is a new platform "
- + "for television built on Android. Google "
- + "has partnered with Sony and Logitech to integrate "
- + "this platform into TVs, blu-ray players, and companion "
- + "boxes. </p>"
- + "<p><a href='http://www.google.com/tv/'>Learn more about "
- + "Google TV &raquo;</a></p>"
+ 'img':"GTV_icon_large.png",
+ 'title':"Google TV!",
+ 'desc': "<p>Build something big. By big, we mean <em>worthy-of-the-living-room</em> big.</p>"
+ + " <p>Use <a href='http://code.google.com/tv'>Google TV</a> to bring the power of Android"
+ + " and Google Chrome to television."
+ + " The average American watches five hours of TV per day. Give them the web and apps"
+ + " to update their status, listen to music, watch web videos, and much more...</p>"
},
+
'devphone': {
'layout':"imgLeft",
'icon':"devphone-small.png",