summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2010-05-18 22:11:07 -0700
committerDirk Dougherty <ddougherty@google.com>2010-05-19 23:50:10 -0700
commitdc737ca986ed9055b4bb39c67d470b6886522ca6 (patch)
tree85e83336dc4b1111512b660cf7dd402ffc2f66b1 /docs
parent55f383a9b8da99aa48857fea27a35badc515d8bd (diff)
downloadframeworks_base-dc737ca986ed9055b4bb39c67d470b6886522ca6.zip
frameworks_base-dc737ca986ed9055b4bb39c67d470b6886522ca6.tar.gz
frameworks_base-dc737ca986ed9055b4bb39c67d470b6886522ca6.tar.bz2
Doc change: Add new tv to carousel.
Change-Id: Ibd36247bbab26d8d4a8e8c15a1d852a2f9cb0269
Diffstat (limited to 'docs')
-rw-r--r--docs/html/index.jd24
1 files changed, 13 insertions, 11 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 230dd4e..0ba5e08 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -141,18 +141,20 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
+ "<a href='{@docRoot}sdk/index.html'>SDK starter package</a>."
},
- 'adc2': {
+ 'tv': {
'layout':"imgLeft",
- 'icon':"adc2_s.png",
- 'name':"ADC 2",
- 'img':"adc2_l.png",
- 'title':"Android Developer Challenge 2",
- 'desc': "<p>We're pleased to announce the "
- + "<a href='http://code.google.com/android/adc/gallery_winners.html'>winners "
- + "of the Android Developer Challenge 2</a>! Please see our "
- + "<a href='http://android-developers.blogspot.com/2009/11/announcing-winners-of-adc-2.html'>blog post</a> "
- + "for full information. Thanks to everyone who participated by submitting an application or judging!</p>"
- + "<p><a href='http://code.google.com/android/adc/'>Learn more about ADC 2 &raquo;</a></p>"
+ 'icon':"tv_s.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. An add-on for the Android SDK will be "
+ + "available early next year. </p>"
+ + "<p><a href='http://www.google.com/tv/'>Learn more about "
+ + "Google TV &raquo;</a></p>"
},
'devphone': {