diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-02 17:55:32 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-02 17:55:32 -0700 |
| commit | 96b7f921a5aea4264af1e0b4970263a3135c04d0 (patch) | |
| tree | c1944e1142c3ec667e91780dbab75a1c3f6784a2 /docs | |
| parent | d3db17d8e8563c1629bc705ecded54a405d84b7e (diff) | |
| parent | c9c00021de5f498ad4c4a91e7a22114139e3065e (diff) | |
| download | frameworks_base-96b7f921a5aea4264af1e0b4970263a3135c04d0.zip frameworks_base-96b7f921a5aea4264af1e0b4970263a3135c04d0.tar.gz frameworks_base-96b7f921a5aea4264af1e0b4970263a3135c04d0.tar.bz2 | |
Merge change 23565 into donut
* changes:
docs only. add new announcement for 1.6 sdk to homepage
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/index.jd | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd index 823ec96..6945f9e 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 and judging by users has started.</p> <p><a href="http://code.google.com/android/adc/">Learn more about ADC 2 »</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:190px"> <!-- this height can be adjusted based on the content height --> </div> <div class="clearer"></div> <div id="carouselWheel"> @@ -120,12 +120,17 @@ 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 »</a></p>" + '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>" }, - + 'io': { 'layout':"imgLeft", 'icon':"io-small.png", |