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

Commit 6c5fe627 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am 73790a53: Merge "docs: add G+ page announcement to homepage" into ics-mr1 

* commit '73790a53':
  docs: add G+ page announcement to homepage
parents 15d07ade 73790a53

docs/html/index.jd

+29 −1
Original line number Diff line number Diff line
@@ -143,6 +143,20 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</ 
+ "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",

      'icon':"GTV_icon_small.png",
@@ -186,5 +200,19 @@ href="{@docRoot}resources/dashboard/platform-versions.html">Learn more &raquo;</ 
</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>

docs/html/resources/community-more.jd

+20 −1
Original line number Diff line number Diff line 
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

docs/html/resources/resources_toc.cs

+1 −1
Original line number Diff line number Diff line
@@ -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>