Merge "docs: update homepage to announce 3.1" into honeycomb-mr1

This commit is contained in:
Scott Main
2011-05-05 08:33:03 -07:00
committed by Android (Google) Code Review

View File

@@ -129,17 +129,20 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
'sdk': { 'sdk': {
'layout':"imgLeft", 'layout':"imgLeft",
'icon':"sdk-small.png", 'icon':"sdk-small.png",
'name':"Android 3.0", 'name':"Android 3.1",
'img':"honeycomb-android.png", 'img':"honeycomb-android.png",
'title':"Android 3.0 is here!", 'title':"Android 3.1 now available!",
'desc': "<p>Android 3.0 is now available for the Android SDK. It offers a redesigned UI and " 'desc': "<p>Android 3.1 includes new developer features such as APIs for USB "
+ "all new developer APIs for an optimized experience on tablets and similar devices. " + "accessories, MTP/PTP, and RTP, as well as new input events from mice, trackballs, joysticks, "
+ "For more information about what's in Android 3.0, read the " + "and more.</p>"
+ "<a href='{@docRoot}sdk/android-3.0.html'>version notes</a>.</p>" + "<p>For more information about all the new APIs in Android 3.1, read the "
+ "<a href='{@docRoot}sdk/android-3.1.html'>version notes</a>.</p>"
/*
+ "<p>If you have an existing SDK, add Android 3.0 as an " + "<p>If you have an existing SDK, add Android 3.0 as an "
+ "<a href='{@docRoot}sdk/adding-components.html'>SDK " + "<a href='{@docRoot}sdk/adding-components.html'>SDK "
+ "component</a>. If you're new to Android, install the " + "component</a>. If you're new to Android, install the "
+ "<a href='{@docRoot}sdk/index.html'>SDK starter package</a>." + "<a href='{@docRoot}sdk/index.html'>SDK starter package</a>."
*/
}, },
'tv': { 'tv': {
@@ -152,8 +155,7 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
+ "for television built on Android. Google " + "for television built on Android. Google "
+ "has partnered with Sony and Logitech to integrate " + "has partnered with Sony and Logitech to integrate "
+ "this platform into TVs, blu-ray players, and companion " + "this platform into TVs, blu-ray players, and companion "
+ "boxes. An add-on for the Android SDK will be " + "boxes. </p>"
+ "available early next year. </p>"
+ "<p><a href='http://www.google.com/tv/'>Learn more about " + "<p><a href='http://www.google.com/tv/'>Learn more about "
+ "Google TV &raquo;</a></p>" + "Google TV &raquo;</a></p>"
}, },