Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5cb0d501 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

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

Merge commit '9c689592' into kraken

* commit '9c689592':
  docs: announce froyo and update IO message
parents c7c856fb 9c689592

docs/html/images/home/io-logo.png

0 → 100644
+8.49 KiB
Loading image diff...

docs/html/index.jd

+21 −18
Original line number Original line Diff line number Diff line
@@ -11,10 +11,13 @@ home=true 
                            </div><!-- end homeTitle -->

                            </div><!-- end homeTitle -->

                            <div id="announcement-block">

                            <div id="announcement-block">

                            <!-- total max width is 520px -->

                            <!-- 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;"/>

                                  <img src="{@docRoot}images/home/io-logo.png" alt="Google IO

                                  <div id="announcement" style="width:275px">

2010" width="200" height="41" style="padding:22px 12px;"/>

<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>

                                  <div id="announcement" style="width:295px">

<p><a href="http://android-developers.blogspot.com/2010/03/android-at-game-developers-conference.html">Learn more &raquo;</a></p>

<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 -->

                            </div> <!-- end annoucement-block -->

                            </div> <!-- end annoucement-block -->

                        </div><!-- end topAnnouncement -->

                        </div><!-- end topAnnouncement -->
@@ -125,17 +128,17 @@ 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 2.1",

      'name':"Android 2.2",

      'img':"sdk-large.png",

      'img':"froyo-android.png",

      'title':"Android 2.1 is now available",

      'title':"Get Android 2.2!",

      'desc': "<p>Android 2.1 is a small feature release that includes new developer APIs "

      'desc': "<p>The Android 2.2 platform is now available for the Android SDK, along with new "

               + "and documentation. For information about what's included in the platform, "

+ "tools, documentation, and a new NDK. "

               + "read the <a href='{@docRoot}sdk/android-2.1.html'>Android 2.1 "

+ "For information about new features and APIs, read the "

               + "version notes</a>.</p>"

+ "<a href='{@docRoot}sdk/android-2.2.html'>version notes</a>.</p>"

               + "<p>You can update your existing development environment "

+ "<p>If you have an existing SDK, add Android 2.2 as an "

               + "by installing the Android 2.1 platform as an "

+ "<a href='{@docRoot}sdk/adding-components.html'>SDK "

+ "<a href='{@docRoot}sdk/adding-components.html'>SDK "

               + "component</a>."

+ "component</a>. If you're new to Android, install the "

+ "<a href='{@docRoot}sdk/index.html'>SDK starter package</a>."

    },

    },





    'adc2': {

    'adc2': {
@@ -179,10 +182,10 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</ 
    'io': {

    'io': {

      'layout':"imgLeft",

      'layout':"imgLeft",

      'icon':"io-small.png",

      'icon':"io-small.png",

      'name':"Google I/O",

      'name':"Google I/O '09'",

      'img':"io-large.png",

      'img':"io-large.png",

      'title':"Google I/O Developer Conference",

      'title':"2009 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>"

      '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>"

    }

    }





  }

  }