Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c91c95e authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 9b7596e1: am 4708d8f5: Merge "docs: add jelly bean to homepage" into jb-dev 

* commit '9b7596e1':
  docs: add jelly bean to homepage
parents f681e740 9b7596e1

docs/html/images/home/android-jellybean.png

0 → 100644
+174 KiB
Loading image diff...

docs/html/index.jd

+25 −9
Original line number Diff line number Diff line
@@ -12,26 +12,42 @@ page.metaDescription=The official site for Android developers. Provides the Andr 
        <a href="" class="slideshow-next">Next</a>

        <div class="frame">

            <ul>

                <li class="item carousel-home">

                    <div class="content-left col-9">

                        <img src="{@docRoot}images/home/android-jellybean.png" >

                    </div>

                    <div class="content-right col-6">

                    <h1>Jelly Bean now available!</h1>

                    <p>Android 4.1 (Jelly Bean) builds on what's great about Android

                      with improvements to performance and user experience.</p>

                    <p>New APIs are also available that allow you to build bigger and more

                      interactive notifications, transfer larger

                    payloads over NFC, discover device services over Wi-Fi, and much more.</p>

                    <p><a href="/about/versions/jelly-bean.html" class="button">More 

                        about Jelly Bean</a></p>

                    </div>

                </li>

                <li class="item carousel-home">

                    <div class="content-left col-10">

                        <img src="{@docRoot}images/home/design.png" style="margin-top:30px">

                    </div>

                    <div class="content-right col-6">

                    <div class="content-right col-5">

                    <h1>Make your Android apps<br>look great</h1>

                    <p>New templates in the design guide make it easier than ever to design apps

that are beautiful and easy to use.</p>

                    <a href="/design/index.html" class="button">Learn More</a>

                    <p><a href="/design/index.html" class="button">Learn More</a></p>

                    </div>

                </li>

                <li class="item carousel-home">

                        <div class="content-left col-10">

                        <img src="/images/home/google-io.png">

                        </div>

                        <div class="content-right col-6">

                        <h1>Watch Android at Google I/O!</h1>

                        <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>

                        <a href="https://developers.google.com/events/io/sessions#android"

class="button">See the Android Sessions</a>

                        <div class="content-right col-5">

                        <h1>Watch Android at <br/>Google I/O!</h1>

                        <p>See the keynote and more than 40 Android developer sessions streamed live from Moscone Center in San Francisco.</p>

                        <p>Begins June 27, 9AM PDT (UTC-7).</p>

                        <p><a href="https://developers.google.com/events/io/sessions#android"

class="button">See the Android Sessions</a></p>

                        </div>

                </li>

                <li class="item carousel-home">
@@ -39,11 +55,11 @@ class="button">See the Android Sessions</a> 
                            <img src="/images/home/google-play.png"

                                  style="margin-top:50px">

                        </div>

                        <div class="content-right col-6">

                        <div class="content-right col-5">

                        <h1>Publish your apps<br>in Google Play</h1>

                        <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>



                        <a href="{@docRoot}distribute/index.html" class="button">Learn More</a>

                        <p><a href="{@docRoot}distribute/index.html" class="button">Learn More</a></p>

                        </div> 

                </li>

            </ul>