diff options
author | Scott Main <smain@google.com> | 2012-01-30 10:03:21 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-01-30 10:03:21 -0800 |
commit | 73790a53b580b8ec8eff88e25a19b5fcfa33392a (patch) | |
tree | d5f73e9bc24b9ba847c3bd34bc70b3453c6bec39 /docs | |
parent | 639b25ea289481da6cfd4229649b51ffc6ce3406 (diff) | |
parent | b1560f20859ac46d48a753e67d9ac33748d2c558 (diff) | |
download | frameworks_base-73790a53b580b8ec8eff88e25a19b5fcfa33392a.zip frameworks_base-73790a53b580b8ec8eff88e25a19b5fcfa33392a.tar.gz frameworks_base-73790a53b580b8ec8eff88e25a19b5fcfa33392a.tar.bz2 |
Merge "docs: add G+ page announcement to homepage" into ics-mr1
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/index.jd | 30 | ||||
-rw-r--r-- | docs/html/resources/community-more.jd | 21 | ||||
-rw-r--r-- | docs/html/resources/resources_toc.cs | 2 |
3 files changed, 50 insertions, 3 deletions
diff --git a/docs/html/index.jd b/docs/html/index.jd index 9197b5d..c14c0ae 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -142,6 +142,20 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more »</ + "href='{@docRoot}sdk/api_diff/15/changes.html'>diff report</a>. If you're new to Android, " + "get started with the <a href='/sdk/index.html'>SDK starter package</a>.</p>" }, + + 'plus': { + 'layout':"imgLeft", + 'icon':"google-plus-small.png", + 'name':"Google+ Page", + 'img':"google-plus.png", + 'title':"Android Developers on Google+", + 'desc': "<p>We now have a Google+ page for <a " ++ "href='https://plus.google.com/108967384991768947849'>+Android Developers</a>. " ++ "We'll use it to host Hangouts for developers, talk about the latest releases, " ++ "development and design tips, and much more.</p>" ++ "<div style='margin-top:.7em'><g:plus href='https://plus.google.com/108967384991768947849' " ++ "size=\"smallbadge\" width=\"275\"></g:plus></div>" + }, 'tv': { 'layout':"imgLeft", @@ -186,5 +200,19 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more »</ </script> <script type="text/javascript" src="{@docRoot}assets/carousel.js"></script> <script type="text/javascript"> - initCarousel("sdk"); + initCarousel("plus"); </script> + +<script type="text/javascript" src="https://plus.google.com/108967384991768947849" +rel="publisher"></script> +<script type="text/javascript"> +window.___gcfg = {lang: 'en'}; +(function() +{var po = document.createElement("script"); +po.type = "text/javascript"; po.async = true;po.src = "https://apis.google.com/js/plusone.js"; +var s = document.getElementsByTagName("script")[0]; +s.parentNode.insertBefore(po, s); +})();</script> +<style type="text/css"> + #___plus_0, #___plus_0 iframe, #___plus_0 { width: 275px !important; } +</style> diff --git a/docs/html/resources/community-more.jd b/docs/html/resources/community-more.jd index df72926..3089d45 100644 --- a/docs/html/resources/community-more.jd +++ b/docs/html/resources/community-more.jd @@ -1,5 +1,5 @@ community=true -page.title=IRC and Twitter +page.title=IRC, G+, Twitter @jd:body <p>In addition to the <a href="community-groups.html">Android developer forums</a>, you can participate in the Android developer community through IRC and you can follow us on Twitter. </p> @@ -45,8 +45,27 @@ does not require any installation, to join discussions on the Android IRC channe </li> </ul> + +<h3 id="gplus">Google+</h3> +<p>We use a Google+ page to host Hangouts for developers, talk about the latest +releases, development and design tips, and much more.</p> + +<div style='margin-top:1em'><g:plus href='https://plus.google.com/108967384991768947849' +size='badge'></g:plus></div> + + <h3 id="twitter">Twitter</h3> <p>You can follow us on Twitter at this account:</p> <p style="margin-left:2em;"><a href="http://twitter.com/androiddev">http://twitter.com/androiddev</a></p> +<script type="text/javascript" src="https://plus.google.com/108967384991768947849" +rel="publisher"></script> +<script type="text/javascript"> +window.___gcfg = {lang: 'en'}; +(function() +{var po = document.createElement("script"); +po.type = "text/javascript"; po.async = true;po.src = "https://apis.google.com/js/plusone.js"; +var s = document.getElementsByTagName("script")[0]; +s.parentNode.insertBefore(po, s); +})();</script>
\ No newline at end of file diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs index 8df419f..628df9e 100644 --- a/docs/html/resources/resources_toc.cs +++ b/docs/html/resources/resources_toc.cs @@ -302,7 +302,7 @@ <span class="en">Developer Forums</span> </a></li> <li><a href="<?cs var:toroot ?>resources/community-more.html"> - <span class="en">IRC, Twitter</span> + <span class="en">IRC, G+, Twitter</span> </a></li> </ul> </li> |