am f80403dd: am ab3d69f6: Merge "docs: update homepage for GB" into gingerbread

* commit 'f80403dd5903e03cb51f374d042a297c84faaec4':
  docs: update homepage for GB
This commit is contained in:
Scott Main
2010-11-06 16:25:32 -07:00
committed by Android Git Automerger

View File

@ -22,7 +22,7 @@ Learn more &raquo;</a></p>
</div> <!-- end annoucement -->
</div> <!-- end annoucement-block -->
</div><!-- end topAnnouncement -->
<div id="carouselMain" style="height:200px"> <!-- this height can be
<div id="carouselMain" style="height:205px"> <!-- this height can be
adjusted based on the content height -->
</div>
<div class="clearer"></div>
@ -129,14 +129,14 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
'sdk': {
'layout':"imgLeft",
'icon':"sdk-small.png",
'name':"Android 2.2",
'img':"froyo-android.png",
'title':"Get Android 2.2!",
'desc': "<p>The Android 2.2 platform is now available for the Android SDK, along with new "
+ "tools, documentation, and a new NDK. "
+ "For information about new features and APIs, read the "
+ "<a href='{@docRoot}sdk/android-2.2.html'>version notes</a>.</p>"
+ "<p>If you have an existing SDK, add Android 2.2 as an "
'name':"Android 2.3",
'img':"gingerdroid.png",
'title':"Android 2.3 is here!",
'desc': "<p>Android 2.3 is now available for the Android SDK. In addition, new "
+ "tools and documentation are available, plus a new NDK that offers more than ever. "
+ "For more information about what's in Android 2.3, read the "
+ "<a href='{@docRoot}sdk/android-2.3.html'>version notes</a>.</p>"
+ "<p>If you have an existing SDK, add Android 2.3 as an "
+ "<a href='{@docRoot}sdk/adding-components.html'>SDK "
+ "component</a>. If you're new to Android, install the "
+ "<a href='{@docRoot}sdk/index.html'>SDK starter package</a>."