auto import from //branches/cupcake/...@130745

1 files changed, 41 insertions, 40 deletions

diff --git a/docs/html/index.jd b/docs/html/index.jd
index 05ab987..8db339d 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -7,14 +7,16 @@ page.title=Home
               <div id="mainBodyLeft">			
                     <div id="homeMiddle">
                         <div id="homeTitle">
-                            <div style="float:left;">
-                                <h2>T-Mobile G1 Now Available!</h2>
-                            </div>
-                            <div style="float:right;" align="center">
-                                <a href="http://www.t-mobileg1.com">Learn more &raquo;</a><br />
-                             <!--   <img src="{@docRoot}assets/images/icon_robot.jpg" style="margin:8px 10px 0 10px; clear:both;" /> -->
-                            </div>
+                            <h2>Developer Announcements</h2>
                         </div><!-- end homeTitle -->
+                        <div id="announcement-block">
+                        <!-- total max width is 520px -->
+                            <img src="{@docRoot}assets/images/home/IO-logo.png" alt="Google I/O Developer Conference 2009" width="242px" />
+                            <div id="announcement" style="width:270px">
+                              <p>Google I/O is a two-day developer event that will take place May 27-28 at Moscone Center, San Francisco.</p>
+                              <p><a href="http://code.google.com/events/io/">Learn more &raquo;</a></p>
+                            </div> <!-- end annoucement -->
+                        </div> <!-- end annoucement-block -->
                         <div id="carouselMain">
                             <div id="bulletinImg"></div>
                             <div id="bulletinDesc"></div>
@@ -27,51 +29,32 @@ page.title=Home
                                   <!-- populated by buildCarousel() -->
                                 </div>
                             </div><!-- end list-clip -->
-                            <a href="javascript:{}" id="arrow-right" onclick="" class="arrow-right-off"></a>
+                            <a href="javascript:page_right()" id="arrow-right" onclick="" class="arrow-right-on"></a>
                             <div class="clearer"></div>
                         </div><!-- end app-list container -->
                     </div><!-- end homeMiddle -->
 
                     <div style="clear:both">&nbsp;</div>
-
-                    <div id="homeBottom">
-                        <table>
-                            <tr>
-                                <td>
-                                    <br />
-                                    <h2>Featured Developer App: BreadCrumbz</h2>
-                                    <p>Amos Yoffe takes navigation to the next level with BreadCrumbz.</p>
-                                    <p><a href="http://www.bcrumbz.com">Learn more about this developer &raquo;</a></p>
-                                </td>
-                                <td>
-                                    <img src="{@docRoot}assets/images/logo_breadcrumbz.jpg" />
-                                </td>
-                            </tr>
-                        </table>
-                    </div><!-- end homeBottom -->
               </div><!-- end mainBodyLeft -->
 
               <div id="mainBodyRight">
                       <table id="rightColumn">
                               <tr>
-                                      <td class="imageCell"><img src="{@docRoot}assets/images/icon_download.jpg" style="padding:0" /></td>
+                                      <td class="imageCell"><a href="{@docRoot}sdk/index.html"><img src="{@docRoot}assets/images/icon_download.jpg" style="padding:0" /></a></td>
                                       <td>
                                               <h2 class="green">Download</h2>
-                                              <p>Latest SDK</p>
-                                              <p><a href="{@docRoot}sdk/index.html">Download now</a></p>
+                                              <p>The Android SDK has the tools, sample code, and docs you need to create great apps.  </p>
+                                              <p><a href="{@docRoot}sdk/1.1_r1/index.html">Learn more &raquo;</a></p>
                                       </td>
                               </tr>
                               <tr>
                                       <td colspan="2"><div class="seperator">&nbsp;</div></td>
                               </tr>
                               <tr>
-                                      <td class="imageCell"><img src="{@docRoot}assets/images/icon_market.jpg" style="padding:0" /></td>
-                                      <td valign="middle"><br /><h2 class="green">Market</h2></td>
-                              </tr>
-                              <tr>
-                                      <td colspan="2">
-                                              <br />
-                                              <p>Android Market is an open service that will give developers the opportunity to distribute applications to handsets.</p>
+                                      <td class="imageCell"><a href="http://www.android.com/market.html"><img src="{@docRoot}assets/images/icon_market.jpg" style="padding:0" /></a></td>
+                                      <td>
+                                              <h2 class="green">Publish</h2>
+                                              <p>Android Market is an open service that lets you distribute your apps to handsets.</p>
                                               <p><a href="http://www.android.com/market.html">Learn more &raquo;</a></p>
                                       </td>
                               </tr>
@@ -79,16 +62,25 @@ page.title=Home
                                       <td colspan="2"><div class="seperator">&nbsp;</div></td>
                               </tr>
                               <tr>
-                                      <td class="imageCell"><img src="{@docRoot}assets/images/icon_contribute.jpg" style="padding:0" /></td>
+                                      <td class="imageCell"><a href="http://source.android.com"><img src="{@docRoot}assets/images/icon_contribute.jpg" style="padding:0" /></a></td>
                                       <td>
                                               <h2 class="green">Contribute</h2>
-                                              <p>Create using our open source codebase and help us keep this project growing.</p>
+                                              <p>Android Open Source Project gives you access to the entire platform source.</p>
                                               <p><a href="http://source.android.com">Learn more &raquo;</a></p>
                                       </td>
                               </tr>
                               <tr>
                                       <td colspan="2"><div class="seperator">&nbsp;</div></td>
                               </tr>
+                              <tr>
+                                      <td class="imageCell"><a href="http://www.youtube.com/user/androiddevelopers"><img src="{@docRoot}assets/images/video-droid.png" style="padding:0" /></a></td>
+                                      <td>
+                                              <h2 class="green">Watch</h2>
+                                              <object width="150" height="140"><param name="movie" value="http://www.youtube.com/v/x1ZZ-R3p_w8&hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/x1ZZ-R3p_w8&hl=en&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="150" height="140"></embed></object>
+                                              <p style="margin-top:1em"><a href="http://www.youtube.com/user/androiddevelopers">More Android videos &raquo;</a></p>
+                                      </td>
+                              </tr>
+
                       </table>
               </div>
 	</div>
@@ -125,10 +117,10 @@ page.title=Home
     'sdk': {
       'layout':"imgLeft",
       'icon':"sdk-small.png",
-      'name':"SDK 1.0 r1",
+      'name':"SDK 1.1 r1",
       'img':"sdk-large.png",
-      'title':"Android 1.0 SDK r1",
-      'desc': "<p>The first Android 1.0 SDK is available for download. This is the first release guaranteed to operate on the first Android devices. If you want to release an application for Android, you should be developing with this SDK.</p><p><a href='{@docRoot}sdk/index.html'>Download Android 1.0 SDK r1</a></p>"
+      'title':"Android 1.1 SDK r1",
+      'desc': "<p>A new Android SDK is available for download. The new SDK includes minor API changes, new UI localizations, bug fixes and some new application features.</p><p><a href='{@docRoot}sdk/1.1_r1/index.html'>Download Android 1.1 SDK r1</a></p>"
     },
 
     'mapskey': {
@@ -137,7 +129,7 @@ page.title=Home
       'name':"Maps API Key",
       'img':"maps-large.png",
       'title':"Maps API Key",
-      'desc':"<p>If you're writing an Android application that uses Google Maps (with MapView), you must register your application to obtain a Maps API Key. Without the key, your maps application will not work on Android devices. Obtaining a key requires just a couple of steps.</p><p><a href='{@docRoot}guide/topics/geo/mapkey.html'>Learn how to get a Maps API Key</a></p>"
+      'desc':"<p>If you're writing an Android application that uses Google Maps (with MapView), you must register your application to obtain a Maps API Key. Without the key, your maps application will not work on Android devices. Obtaining a key requires just a couple of steps.</p><p><a href='{@docRoot}guide/topics/location/geo/mapkey.html'>Learn how to get a Maps API Key</a></p>"
     },
 
     'market': {
@@ -147,6 +139,15 @@ page.title=Home
       'img':"market-large.png",
       'title':"",
       'desc': "<p>Android Market helps you get your applications into the hands of users. The beta version of Market is now open and you can begin sharing your applications with users of the first Android-powered phone, the T-Mobile G1.</p><p><a href='http://market.android.com/publish/'>Publish your Android app on Market &raquo;</a></p>"
+    },
+
+    'devphone': {
+      'layout':"imgLeft",
+      'icon':"devphone-small.png",
+      'name':"Dev Phone 1",
+      'img':"devphone-large.png",
+      'title':"Android Dev Phone 1",
+      'desc': "<p>Run and debug your Android applications directly on this device. Modify and rebuild the Android operating system, and flash it onto the phone. The Android Dev Phone 1 is carrier independent, and available for purchase by any developer registered with <a href='http://market.android.com/publish'>Android Market</a>.</p><p><a href='/guide/developing/device.html#dev-phone-1'>Learn more about the Android Dev Phone 1 &raquo;</a></p>"
     }
 
   }