summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <nobody@android.com>2009-06-14 20:45:27 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-06-14 20:45:27 -0700
commit3d59ee7aa66a5b1e80f5042f8d872dd9819b5f40 (patch)
treeb6b25081ea1a143cda4ea38290b2376a8d5ca937
parent2fdd428e0f18384160f7c38ce3a2cd9ba7e7b2c2 (diff)
parent110b50ca5158f75abdead740f0956600da2f212d (diff)
downloadframeworks_base-3d59ee7aa66a5b1e80f5042f8d872dd9819b5f40.zip
frameworks_base-3d59ee7aa66a5b1e80f5042f8d872dd9819b5f40.tar.gz
frameworks_base-3d59ee7aa66a5b1e80f5042f8d872dd9819b5f40.tar.bz2
am 110b50ca: AI 149839: make the home page\'s announcement block expandable... primarily, this is to handle various lengths of text due to translations, but also allows us to be more flexible WRT the content for the top section.
Merge commit '110b50ca5158f75abdead740f0956600da2f212d' into donut * commit '110b50ca5158f75abdead740f0956600da2f212d': AI 149839: make the home page's announcement block expandable...
-rw-r--r--docs/html/index.jd54
1 files changed, 29 insertions, 25 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd
index ea326b0..07d0abe 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -5,32 +5,36 @@ home=true
<div id="mainBodyFixed">
<div id="mainBodyLeft">
<div id="homeMiddle">
- <div id="homeTitle">
- <h2>Developer Announcements</h2>
- </div><!-- end homeTitle -->
- <div id="announcement-block">
- <!-- total max width is 520px -->
- <img src="{@docRoot}assets/images/home/IO-logo.png" alt="Google I/O Developer Conference 2009" width="242px" />
- <div id="announcement" style="width:270px">
- <p>Google I/O is a two-day developer event that will take place May 27-28 at Moscone Center, San Francisco. The agenda includes a number of great sessions on Android topics by team engineers and other developers.</p>
- <p><a href="http://code.google.com/events/io/">Learn more &raquo;</a></p>
- </div> <!-- end annoucement -->
- </div> <!-- end annoucement-block -->
- <div id="carouselMain">
- <div id="bulletinImg"></div>
- <div id="bulletinDesc"></div>
- </div>
- <div class="clearer"></div>
- <div class="app-list-container" align="center">
- <a href="javascript:{}" id="arrow-left" onclick="" class="arrow-left-off"></a>
- <div id="list-clip">
- <div style="left: 0px;" id="app-list">
- <!-- populated by buildCarousel() -->
- </div>
- </div><!-- end list-clip -->
- <a href="javascript:page_right()" id="arrow-right" onclick="" class="arrow-right-on"></a>
+ <div id="topAnnouncement">
+ <div id="homeTitle">
+ <h2>Developer Announcements</h2>
+ </div><!-- end homeTitle -->
+ <div id="announcement-block">
+ <!-- total max width is 520px -->
+ <img src="/assets/images/home/IO-logo.png" alt="Google I/O Developer Conference 2009" width="242px" />
+ <div id="announcement" style="width:270px">
+ <p>Google I/O is a two-day developer event that will take place May 27-28 at Moscone Center, San Francisco. The agenda includes a number of great sessions on Android topics by team engineers and other developers.</p>
+ <p><a href="http://code.google.com/events/io/">Learn more &raquo;</a></p>
+ </div> <!-- end annoucement -->
+ </div> <!-- end annoucement-block -->
+ </div><!-- end topAnnouncement -->
+ <div id="carousel">
+ <div id="carouselMain">
+ <div id="bulletinImg"></div>
+ <div id="bulletinDesc"></div>
+ </div>
<div class="clearer"></div>
- </div><!-- end app-list container -->
+ <div class="app-list-container" align="center">
+ <a href="javascript:{}" id="arrow-left" onclick="" class="arrow-left-off"></a>
+ <div id="list-clip">
+ <div style="left: 0px;" id="app-list">
+ <!-- populated by buildCarousel() -->
+ </div>
+ </div><!-- end list-clip -->
+ <a href="javascript:page_right()" id="arrow-right" onclick="" class="arrow-right-on"></a>
+ <div class="clearer"></div>
+ </div><!-- end app-list container -->
+ </div><!-- end carousel -->
</div><!-- end homeMiddle -->
<div style="clear:both">&nbsp;</div>