summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2010-11-06 14:21:23 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-11-06 14:21:23 -0700
commitf80403dd5903e03cb51f374d042a297c84faaec4 (patch)
tree5baed291830db33bbd543f065e8df465fb5b91d6 /docs/html
parent3442611ee11b2987c83054fe3c7ed5521f27f052 (diff)
parentab3d69f6d5a9157438f86cf90449a5f5ce7e31e0 (diff)
downloadframeworks_base-f80403dd5903e03cb51f374d042a297c84faaec4.zip
frameworks_base-f80403dd5903e03cb51f374d042a297c84faaec4.tar.gz
frameworks_base-f80403dd5903e03cb51f374d042a297c84faaec4.tar.bz2
am ab3d69f6: Merge "docs: update homepage for GB" into gingerbread
* commit 'ab3d69f6d5a9157438f86cf90449a5f5ce7e31e0': docs: update homepage for GB
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/index.jd18
1 files changed, 9 insertions, 9 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 049df62..1302188 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -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>."