docs: add 2.0 highlights doc and updated homepage
diff --git a/docs/html/index.jd b/docs/html/index.jd
index dc8bf2f..9d349ca 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -20,7 +20,7 @@
</div> <!-- end annoucement -->
</div> <!-- end annoucement-block -->
</div><!-- end topAnnouncement -->
- <div id="carouselMain" style="height:190px"> <!-- this height can be adjusted based on the content height -->
+ <div id="carouselMain" style="height:215px"> <!-- this height can be adjusted based on the content height -->
</div>
<div class="clearer"></div>
<div id="carouselWheel">
@@ -46,8 +46,8 @@
<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>The Android SDK has the tools, sample code, and docs you need to create great apps. </p>
- <p><a href="{@docRoot}sdk/{@sdkCurrent}/index.html">Learn more »</a></p>
+ <p>The Android SDK the tools, sample code, and docs you need to create great apps.</p>
+ <p><a href="{@docRoot}sdk/index.html">Learn more »</a></p>
</td>
</tr>
<tr>
@@ -79,7 +79,7 @@
<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/GARMe7Km_gk&hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/GARMe7Km_gk&hl=en&fs=1" type="application/x-shockwave-flash" allowscriptaccess="always" allowfullscreen="true" width="150" height="140"></embed></object>
+ <object width="150" height="140"><param name="movie" value="http://www.youtube.com/v/N6YdwzAvwOA&hl=en&fs=1"></param><param name="allowFullScreen" value="true"></param><param name="allowscriptaccess" value="always"></param><embed src="http://www.youtube.com/v/N6YdwzAvwOA&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="{@docRoot}videos/index.html">More Android videos »</a></p>
</td>
</tr>
@@ -120,24 +120,25 @@
'sdk': {
'layout':"imgLeft",
'icon':"sdk-small.png",
- 'name':"Android 1.6 SDK",
- 'img':"donut-android.png",
- 'title':"Android 1.6 SDK",
- 'desc': "<p>The Android 1.6 SDK is now available, with new APIs and updated tools!</p>"
- + " <p>For more about the Android 1.6 platform, read the <a href='http://developer.android.com/sdk/android-1.6-highlights.html'>highlights</a>"
- + "<!--and watch some <a href='http://developer.android.com/videos/index.html'>videos</a>-->."
- + " Also keep an eye on the <a href='http://android-developers.blogspot.com'>Blog</a>"
- + " for posts about some of the new developer technologies in Android 1.6.</p>"
- + "<p><a href='{@docRoot}sdk/1.6_r1/index.html'>Download the Android 1.6 SDK »</a></p>"
+ 'name':"Android 2.0",
+ 'img':"eclair-android.png",
+ 'title':"Android 2.0 has arrived!",
+ 'desc': "<p>Android 2.0 includes exciting new features and APIs. "
+ + "For information about what's included in the new platform, read "
+ + "the <a href='{@docRoot}sdk/android-2.0.html'>Android 2.0 version notes</a>.</p>"
+ + "<p>If you have the Android 1.6 SDK, you can update your environment "
+ + "by installing the Android 2.0 platform and updated tools as "
+ + "<a href='{@docRoot}sdk/adding-components.html'>SDK components</a>. Otherwise, "
+ + "<a href='{@docRoot}sdk/index.html'>download a new Android SDK</a>.</p>"
},
- 'io': {
+ 'devphone': {
'layout':"imgLeft",
- 'icon':"io-small.png",
- 'name':"Google I/O",
- '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 »</a></p>"
+ '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 »</a></p>"
},
'mapskey': {
@@ -149,13 +150,13 @@
'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='http://code.google.com/android/add-ons/google-apis/maps-overview.html'>Learn more »</a></p>"
},
- 'devphone': {
+ 'io': {
'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 »</a></p>"
+ 'icon':"io-small.png",
+ 'name':"Google I/O",
+ '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 »</a></p>"
}
}