diff options
| author | Joe Malin <jmalin@google.com> | 2011-07-07 18:19:18 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-07 18:19:18 -0700 |
| commit | 0e89d916f078a518093c476725fa7e0798dcc590 (patch) | |
| tree | e026f67822de70649bd0052ec9215f2901ff3c33 /docs | |
| parent | 0fbe1dfb8df94a51d79e9a42fcbaebed6f6e516e (diff) | |
| parent | 16f191feaaf33bf9ec4f657ebd298337737aa08d (diff) | |
| download | frameworks_base-0e89d916f078a518093c476725fa7e0798dcc590.zip frameworks_base-0e89d916f078a518093c476725fa7e0798dcc590.tar.gz frameworks_base-0e89d916f078a518093c476725fa7e0798dcc590.tar.bz2 | |
Merge "DOC CHANGE: Change GTV info on intro page" into honeycomb-mr2
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/index.jd | 19 |
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 »</ '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 »</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", |