docs: add Google IO announcement and remove "new" superscripts

Change-Id: Ie08ca264ae3f0d57803ec037ec1918479e38f259

4 files changed, 17 insertions, 15 deletions

diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs
index 927c3fad2737..35da8d49fb02 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -199,7 +199,7 @@
           </a></li>
       <li><a href="<?cs var:toroot?>guide/topics/wireless/bluetooth.html">
             <span class="en">Bluetooth</span>
-          </a> <span class="new">new!</span></li>
+          </a></li>
     </ul>
   </li>
   
diff --git a/docs/html/images/home/io-logo.png b/docs/html/images/home/io-logo.png
new file mode 100644
index 000000000000..f579ca276444
--- /dev/null
+++ b/docs/html/images/home/io-logo.png
diff --git a/docs/html/index.jd b/docs/html/index.jd
index dd42ced6b724..be075099d212 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -11,10 +11,12 @@ home=true
                             </div><!-- end homeTitle -->
                             <div id="announcement-block">
                             <!-- total max width is 520px -->
-                                  <img src="{@docRoot}assets/images/home/gdc-logo.png" alt="Android at GDC 2010" width="203px" style="padding-left:22px;padding-bottom:28px;padding-top:22px;"/>
-                                  <div id="announcement" style="width:275px">
-<p>Thanks to everyone who attended our sessions at the <a href="http://www.gdconf.com/">2010 Game Developers Conference</a> in San Francisco. We're looking forward to seeing your games running on Android!</p>
-<p><a href="http://android-developers.blogspot.com/2010/03/android-at-game-developers-conference.html">Learn more &raquo;</a></p>
+                                  <img src="{@docRoot}images/home/io-logo.png" alt="Google IO
+2010" width="200" height="41" style="padding:22px 12px;"/>
+                                  <div id="announcement" style="width:295px">
+<p>Google I/O is a two-day developer event that will take place May 19-20 at Moscone Center, San
+Francisco. The agenda includes several great sessions about Android by team members.</p>
+<p><a href="http://code.google.com/events/io/2010/sessions.html#Android">Learn more &raquo;</a></p>
                                 </div> <!-- end annoucement -->
                             </div> <!-- end annoucement-block -->
                         </div><!-- end topAnnouncement -->
@@ -179,10 +181,10 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
     'io': {
       'layout':"imgLeft",
       'icon':"io-small.png",
-      'name':"Google I/O",
+      'name':"Google I/O '09",
       'img':"io-large.png",
-      'title':"Google I/O Developer Conference",
-      'desc': "<p>The Google I/O developer conference took place May 27-28 in San Francisco. If you missed the conference, you can experience the Android sessions by viewing YouTube videos.</p><p><a href='{@docRoot}videos/index.html'>See the sessions from Google I/O &raquo;</a></p>"
+      'title':"2009 Google I/O Developer Conference",
+      'desc': "<p>The 2009 Google I/O developer conference took place May 27-28 in San Francisco. If you missed the conference, you can experience the Android sessions by viewing YouTube videos.</p><p><a href='{@docRoot}videos/index.html'>See the sessions from Google I/O &raquo;</a></p>"
     }
 
   }
diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs
index 5958f7157ba6..ebee8012bd52 100644
--- a/docs/html/resources/resources_toc.cs
+++ b/docs/html/resources/resources_toc.cs
@@ -25,7 +25,7 @@
     <ul>
       <li><a href="<?cs var:toroot ?>resources/dashboard/platform-versions.html">
             <span class="en">Platform Versions</span>
-          </a>  <span class="new">new!</span></li>
+          </a></li>
     </ul>
   </li>
 
@@ -36,7 +36,7 @@
       <li class="toggle-list">
         <div><a href="<?cs var:toroot ?>resources/articles/index.html">
                <span class="en">List of Articles</span>
-             </a> <span class="new">new!</span></div>
+             </a></div>
         <ul>
         <li><a href="<?cs var:toroot ?>resources/articles/avoiding-memory-leaks.html">
                 <span class="en">Avoiding Memory Leaks</span>
@@ -85,7 +85,7 @@
                 </a></li>
         <li><a href="<?cs var:toroot ?>resources/articles/live-wallpapers.html">
                 <span class="en">Live Wallpapers</span>
-                </a> <span class="new">new!</span></li>
+                </a></li>
         <li><a href="<?cs var:toroot ?>resources/articles/on-screen-inputs.html">
                 <span class="en">Onscreen Input Methods</span>
                 </a></li>
@@ -118,7 +118,7 @@
                 </a></li>
         <li><a href="<?cs var:toroot ?>resources/articles/contacts.html">
                 <span class="en">Using the Contacts API</span>
-                </a> <span class="new">new!</span></li>
+                </a></li>
         <li><a href="<?cs var:toroot ?>resources/articles/using-webviews.html">
                 <span class="en">Using WebViews</span>
                 </a></li>
@@ -183,7 +183,7 @@
       <li class="toggle-list">
         <div><a href="<?cs var:toroot ?>resources/samples/index.html">
                <span class="en">List of Samples</span>
-             </a> <span class="new">new!</span></div>
+             </a></div>
         <ul>
           <li><a href="<?cs var:toroot ?>resources/samples/ApiDemos/index.html">
                 <span class="en">API Demos</span>
@@ -205,7 +205,7 @@
               </a></li>
           <li><a href="<?cs var:toroot ?>resources/samples/CubeLiveWallpaper/index.html">
                 <span class="en">Live Wallpaper</span>
-                </a> <span class="new">new!</span></li>
+                </a></li>
           <li><a href="<?cs var:toroot ?>resources/samples/LunarLander/index.html">
                 <span class="en">Lunar Lander</span>
               </a></li>
@@ -217,7 +217,7 @@
               </a></li>
           <li><a href="<?cs var:toroot ?>resources/samples/SampleSyncAdapter/index.html">
                 <span class="en">Sample Sync Adapter</span>
-              </a> <span class="new">new!</span></li>
+              </a></li>
           <li><a href="<?cs var:toroot ?>resources/samples/SearchableDictionary/index.html">
                 <span class="en">Searchable Dictionary</span>
               </a></li>