Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c80b95a8: Merge "docs: announce froyo and update IO message" into froyo

Browse Source 
Merge commit 'c80b95a85ae31eba80870cb3416fd2c25821c056' into froyo-plus-aosp

* commit 'c80b95a85ae31eba80870cb3416fd2c25821c056':
  docs: announce froyo and update IO message
This commit is contained in:
Scott Main
2010-05-12 07:49:51 -07:00
committed by Android Git Automerger
parent d2084bb689 c80b95a85a
commit 9c68959240
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/html/images/home/io-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.5 KiB

39
docs/html/index.jd
View File

@@ -11,10 +11,13 @@ home=true
</div><!-- end homeTitle -->
<div id="announcement-block">
<!-- total max width is 520px -->
<img src="{@docRoot}assets/images/home/gdc-logo.png" alt="Android at GDC 2010" width="203px" style="padding-left:22px;padding-bottom:28px;padding-top:22px;"/>
<div id="announcement" style="width:275px">
<p>Thanks to everyone who attended our sessions at the <a href="http://www.gdconf.com/">2010 Game Developers Conference</a> in San Francisco. We're looking forward to seeing your games running on Android!</p>
<p><a href="http://android-developers.blogspot.com/2010/03/android-at-game-developers-conference.html">Learn more &raquo;</a></p>
<img src="{@docRoot}images/home/io-logo.png" alt="Google IO
2010" width="200" height="41" style="padding:22px 12px;"/>
<div id="announcement" style="width:295px">
<p>Google I/O is happening now! To those of you with us, welcome! If you couldn't make it to the
event, stay tuned for videos and slides from the Android sessions, which will be posted at the
Google I/O web site.</p><p><a
href="http://code.google.com/events/io/2010/sessions.html#Android">Learn more &raquo;</a></p>
</div> <!-- end annoucement -->
</div> <!-- end annoucement-block -->
</div><!-- end topAnnouncement -->
@@ -125,17 +128,17 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
'sdk': {
'layout':"imgLeft",
'icon':"sdk-small.png",
'name':"Android 2.1",
'img':"sdk-large.png",
'title':"Android 2.1 is now available",
'desc': "<p>Android 2.1 is a small feature release that includes new developer APIs "
+ "and documentation. For information about what's included in the platform, "
+ "read the <a href='{@docRoot}sdk/android-2.1.html'>Android 2.1 "
+ "version notes</a>.</p>"
+ "<p>You can update your existing development environment "
+ "by installing the Android 2.1 platform as an "
+ "<a href='{@docRoot}sdk/adding-components.html'>SDK "
+ "component</a>."
'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 "
+ "<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>."
},
'adc2': {
@@ -179,10 +182,10 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
'io': {
'layout':"imgLeft",
'icon':"io-small.png",
'name':"Google I/O",
'name':"Google I/O '09'",
'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>"
'title':"2009 Google I/O Developer Conference",
'desc': "<p>The 2009 Google I/O developer conference took place May 27-28, 2009, 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>"
}
}