diff options
| author | Dirk Dougherty <ddougherty@google.com> | 2010-01-22 14:23:39 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-01-22 14:23:39 -0800 |
| commit | 5d14cb34c0e9760340c15ac5faf2d76a64797117 (patch) | |
| tree | 55d1172f8565dfc4055d7924732d5e777ea72e41 /docs | |
| parent | 098295a5a3e840e94040ce38eb08eb6c72b2a7e0 (diff) | |
| parent | a0fc438334562abde67850556d0d0c853e1a3989 (diff) | |
| download | frameworks_base-5d14cb34c0e9760340c15ac5faf2d76a64797117.zip frameworks_base-5d14cb34c0e9760340c15ac5faf2d76a64797117.tar.gz frameworks_base-5d14cb34c0e9760340c15ac5faf2d76a64797117.tar.bz2 | |
Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/html/index.jd | 26 | ||||
| -rw-r--r-- | docs/html/mwc2010/index.html | 8 |
2 files changed, 27 insertions, 7 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd index 7c28583..e12a00a 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -11,14 +11,12 @@ home=true </div><!-- end homeTitle --> <div id="announcement-block"> <!-- total max width is 520px --> - <img src="{@docRoot}assets/images/home/android_adc.png" alt="Android Developer Challenge 2" width="232px" /> - <div id="announcement" style="width:275px"> - <p>The second Android Developer Challenge has begun! In this contest, - real-world users will help review and score applications and the overall winner will - take away $250,000. The deadline for submissions was August 31, 2009.</p> - <p><a href="http://code.google.com/android/adc/">Learn more about ADC 2 »</a></p> + <img src="/assets/images/home/Android_Dev_Lab_l.png" alt="Android developer labs" width="100px" style="padding-left:78px;padding-right:46px;padding-bottom: 8px;"/> + <div id="announcement" style="width:275px"> +<p>We're hosting the next Android Developer Lab in Barcelona at <a href="http://www.mobileworldcongress.com/index.htm">Mobile World Congress »</a> on Wednesday February 17th at <a href="http://www.mobileworldcongress.com/exhibition/app_planet.htm">App Planet »</a>, located in Hall 7. Come visit us to attend a technical presentation, talk to our Android developer relations team, and meet other members of the developer community.</p><p>Check the Android Developers blog for more information soon!</p> +<!--<p><a href="http://android-developers.blogspot.com/2009/11/bring-your-lab-coats.html">Learn more »</a></p>--> </div> <!-- end annoucement --> - </div> <!-- end annoucement-block --> + </div> <!-- end annoucement-block --> </div><!-- end topAnnouncement --> <div id="carouselMain" style="height:200px"> <!-- this height can be adjusted based on the content height --> @@ -140,6 +138,20 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more »</ + "component</a>." }, + 'adc2': { + 'layout':"imgLeft", + 'icon':"adc2_s.png", + 'name':"ADC 2", + 'img':"adc2_l.png", + 'title':"Android Developer Challenge 2", + 'desc': "<p>We're pleased to announce the " + + "<a href='http://code.google.com/android/adc/gallery_winners.html'>winners " + + "of the Android Developer Challenge 2</a>! Please see our " + + "<a href='http://android-developers.blogspot.com/2009/11/announcing-winners-of-adc-2.html'>blog post</a> " + + "for full information. Thanks to everyone who participated by submitting an application or judging!</p>" + + "<p><a href='http://code.google.com/android/adc/'>Learn more about ADC 2 »</a></p>" + }, + 'devphone': { 'layout':"imgLeft", 'icon':"devphone-small.png", diff --git a/docs/html/mwc2010/index.html b/docs/html/mwc2010/index.html new file mode 100644 index 0000000..22319a2 --- /dev/null +++ b/docs/html/mwc2010/index.html @@ -0,0 +1,8 @@ +<html> +<head> +<title>Redirecting...</title> +<meta http-equiv="refresh" content="0;url=/index.html"> +</head> +<body> +</body> +</html> |