Skip to content

Commit 4708d8f

Browse files
scottamainAndroid (Google) Code Review
authored andcommitted
Merge "docs: add jelly bean to homepage" into jb-dev
2 parents 1b4ea7e + 32c1c5c commit 4708d8f

File tree

2 files changed

+25
-9
lines changed

2 files changed

+25
-9
lines changed
174 KB
Loading

docs/html/index.jd

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,38 +12,54 @@ page.metaDescription=The official site for Android developers. Provides the Andr
1212
<a href="" class="slideshow-next">Next</a>
1313
<div class="frame">
1414
<ul>
15+
<li class="item carousel-home">
16+
<div class="content-left col-9">
17+
<img src="{@docRoot}images/home/android-jellybean.png" >
18+
</div>
19+
<div class="content-right col-6">
20+
<h1>Jelly Bean now available!</h1>
21+
<p>Android 4.1 (Jelly Bean) builds on what's great about Android
22+
with improvements to performance and user experience.</p>
23+
<p>New APIs are also available that allow you to build bigger and more
24+
interactive notifications, transfer larger
25+
payloads over NFC, discover device services over Wi-Fi, and much more.</p>
26+
<p><a href="/about/versions/jelly-bean.html" class="button">More
27+
about Jelly Bean</a></p>
28+
</div>
29+
</li>
1530
<li class="item carousel-home">
1631
<div class="content-left col-10">
1732
<img src="{@docRoot}images/home/design.png" style="margin-top:30px">
1833
</div>
19-
<div class="content-right col-6">
34+
<div class="content-right col-5">
2035
<h1>Make your Android apps<br>look great</h1>
2136
<p>New templates in the design guide make it easier than ever to design apps
2237
that are beautiful and easy to use.</p>
23-
<a href="/design/index.html" class="button">Learn More</a>
38+
<p><a href="/design/index.html" class="button">Learn More</a></p>
2439
</div>
2540
</li>
2641
<li class="item carousel-home">
2742
<div class="content-left col-10">
2843
<img src="/images/home/google-io.png">
2944
</div>
30-
<div class="content-right col-6">
31-
<h1>Watch Android at Google I/O!</h1>
32-
<p>See the keynote and more than 40 Android developer sessions streamed live from Moscone Center in San Francisco. <div style="margin-top:-22px;">Begins June 27, 9AM PDT (UTC-7).</span></p>
33-
<a href="https://developers.google.com/events/io/sessions#android"
34-
class="button">See the Android Sessions</a>
45+
<div class="content-right col-5">
46+
<h1>Watch Android at <br/>Google I/O!</h1>
47+
<p>See the keynote and more than 40 Android developer sessions streamed live from Moscone Center in San Francisco.</p>
48+
<p>Begins June 27, 9AM PDT (UTC-7).</p>
49+
<p><a href="https://developers.google.com/events/io/sessions#android"
50+
class="button">See the Android Sessions</a></p>
3551
</div>
3652
</li>
3753
<li class="item carousel-home">
3854
<div class="content-left col-10">
3955
<img src="/images/home/google-play.png"
4056
style="margin-top:50px">
4157
</div>
42-
<div class="content-right col-6">
58+
<div class="content-right col-5">
4359
<h1>Publish your apps<br>in Google Play</h1>
4460
<p>The most visited store in the world for Android apps. Cloud-connected and always synced, it's never been easier for users to find and download your apps.</p>
4561

46-
<a href="{@docRoot}distribute/index.html" class="button">Learn More</a>
62+
<p><a href="{@docRoot}distribute/index.html" class="button">Learn More</a></p>
4763
</div>
4864
</li>
4965
</ul>

0 commit comments

Comments
 (0)