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

am 5d14cb34: Merge "doc change: add announce for developer lab at mwc. move adc to carousel." into eclair

Browse Source 
Merge commit '5d14cb34c0e9760340c15ac5faf2d76a64797117' into eclair-plus-aosp

* commit '5d14cb34c0e9760340c15ac5faf2d76a64797117':
  doc change: add announce for developer lab at mwc. move adc to carousel.
This commit is contained in:
Dirk Dougherty
2010-01-22 14:28:05 -08:00
committed by Android Git Automerger
parent 89fec7b155 5d14cb34c0
commit 97ca28cdd9
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
docs/html/index.jd
View File

@@ -11,14 +11,12 @@ 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/android_adc.png" alt="Android Developer Challenge 2" width="232px" /> <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"> <div id="announcement" style="width:275px">
<p>The second Android Developer Challenge has begun! In this contest, <p>We're hosting the next Android Developer Lab in Barcelona at <a href="http://www.mobileworldcongress.com/index.htm">Mobile World Congress&nbsp;&raquo;</a> on Wednesday February 17th at <a href="http://www.mobileworldcongress.com/exhibition/app_planet.htm">App Planet&nbsp;&raquo;</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>
real-world users will help review and score applications and the overall winner will <!--<p><a href="http://android-developers.blogspot.com/2009/11/bring-your-lab-coats.html">Learn more &raquo;</a></p>-->
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 &raquo;</a></p>
</div> <!-- end annoucement --> </div> <!-- end annoucement -->
</div> <!-- end annoucement-block --> </div> <!-- end annoucement-block -->
</div><!-- end topAnnouncement --> </div><!-- end topAnnouncement -->
<div id="carouselMain" style="height:200px"> <!-- this height can be <div id="carouselMain" style="height:200px"> <!-- this height can be
adjusted based on the content height --> adjusted based on the content height -->
@@ -140,6 +138,20 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</
+ "component</a>." + "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 &raquo;</a></p>"
},
'devphone': { 'devphone': {
'layout':"imgLeft", 'layout':"imgLeft",
'icon':"devphone-small.png", 'icon':"devphone-small.png",

8
docs/html/mwc2010/index.html Normal file
View File

@@ -0,0 +1,8 @@
<html>
<head>
<title>Redirecting...</title>
<meta http-equiv="refresh" content="0;url=/index.html">
</head>
<body>
</body>
</html>