summaryrefslogtreecommitdiffstats
path: root/docs/html/index.jd
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/index.jd')
-rw-r--r--docs/html/index.jd50
1 files changed, 28 insertions, 22 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 823ec96..9d349ca 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -15,12 +15,12 @@ home=true
<div id="announcement" style="width:275px">
<p>The second Android Developer Challenge has begun! In this contest,
real-world users will help review and score applications and the overall winner will
- take away $250,000. The deadline for submitting an application to the contest is August 31, 2009.</p>
+ take away $250,000. The deadline for submissions was August 31, 2009.</p>
<p><a href="http://code.google.com/android/adc/">Learn more about ADC 2 &raquo;</a></p>
</div> <!-- end annoucement -->
</div> <!-- end annoucement-block -->
</div><!-- end topAnnouncement -->
- <div id="carouselMain" style="height:192px"> <!-- 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 @@ home=true
<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 &raquo;</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 &raquo;</a></p>
</td>
</tr>
<tr>
@@ -79,7 +79,7 @@ home=true
<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 &raquo;</a></p>
</td>
</tr>
@@ -120,19 +120,25 @@ home=true
'sdk': {
'layout':"imgLeft",
'icon':"sdk-small.png",
- 'name':"SDK 1.5 r3",
- 'img':"sdk-large.png",
- 'title':"Android 1.5 SDK",
- 'desc': "<p>Android 1.5 SDK is now available. It includes new APIs for Android 1.5, updated developer tools, multiple platform versions, and a Google APIs add-on.</p><p><a href='{@docRoot}sdk/1.5_r3/index.html'>Download Android 1.5 SDK &raquo;</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 &raquo;</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 &raquo;</a></p>"
},
'mapskey': {
@@ -144,13 +150,13 @@ home=true
'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 &raquo;</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 &raquo;</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 &raquo;</a></p>"
}
}