diff options
| author | Scott Main <smain@google.com> | 2013-02-25 18:46:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-02-25 18:46:53 +0000 |
| commit | f4b36ad1617920691def64c00179666e2e42d5fa (patch) | |
| tree | c477411968ac2d21acb174b1ca01433cb2d7fc57 | |
| parent | 02a4cec107f1f07409fd03106b1cde56043894fa (diff) | |
| parent | c4bed529101b233f66e60e18a54ef6c9b97357f4 (diff) | |
| download | frameworks_base-f4b36ad1617920691def64c00179666e2e42d5fa.zip frameworks_base-f4b36ad1617920691def64c00179666e2e42d5fa.tar.gz frameworks_base-f4b36ad1617920691def64c00179666e2e42d5fa.tar.bz2 | |
am c4bed529: am 93b4fcf4: am f714e078: am b38066bb: am d51eebae: docs: add google io registration announcement to home page
* commit 'c4bed529101b233f66e60e18a54ef6c9b97357f4':
docs: add google io registration announcement to home page
| -rw-r--r-- | docs/html/images/home/io-logo-2013.png | bin | 0 -> 10732 bytes | |||
| -rw-r--r-- | docs/html/index.jd | 27 |
2 files changed, 15 insertions, 12 deletions
diff --git a/docs/html/images/home/io-logo-2013.png b/docs/html/images/home/io-logo-2013.png Binary files differnew file mode 100644 index 0000000..c95719e --- /dev/null +++ b/docs/html/images/home/io-logo-2013.png diff --git a/docs/html/index.jd b/docs/html/index.jd index afda7a9..a0029b5 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -13,6 +13,21 @@ page.metaDescription=The official site for Android developers. Provides the Andr <div class="frame"> <ul> <li class="item carousel-home"> + <div class="content-left col-10"> + <img src="{@docRoot}images/home/io-logo-2013.png" style="margin:40px 0 0"> + </div> + <div class="content-right col-5"> + <h1>Google I/O 2013</h1> + <p>Android will be at Google I/O on May 15-17, 2013, with sessions covering a variety of topics + such as design, performance, and how to extend your app with the latest Android features. + Registration opens on March 13, 2013 at 7:00 AM PDT (GMT-7).</p> + <p>For more information about event details and planned sessions, + stay tuned to <a + href="http://google.com/+GoogleDevelopers">+Google Developers</a>.</p> + <p><a href="https://developers.google.com/events/io/" class="button">Register here</a></p> + </div> + </li> + <li class="item carousel-home"> <div class="content-left col-11" style="padding-top:65px;"> <script src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script> <div style="box-shadow: 3px 10px 18px 1px #999;width:600px;height:338px"> @@ -80,18 +95,6 @@ that are beautiful and easy to use.</p> </li> <li class="item carousel-home"> <div class="content-left col-10"> - <img src="{@docRoot}images/home/google-io.png"> - </div> - <div class="content-right col-5"> - <h1>Android videos<br/> from Google I/O!</h1> - <p>If you couldn't make it to Google I/O this year or want to review some of the material, - all of the Android sessions are now available for viewing online.</p> - <p><a href="http://www.youtube.com/playlist?list=PL4C6BCDE45E05F49E&feature=plcp" -class="button">Watch the Android sessions</a></p> - </div> - </li> - <li class="item carousel-home"> - <div class="content-left col-10"> <img src="{@docRoot}images/home/google-play.png" style="margin-top:50px"> </div> |
