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

Commit 00e9db5d authored by Robert Ly's avatar Robert Ly Committed by Android Git Automerger
Browse files

am b23a35a3: am ba84a04a: Merge "docs: update javadocs for gms and gcm" into jb-mr1-dev 

# Via Android (Google) Code Review (1) and others
* commit 'b23a35a3':
  docs: update javadocs for gms and gcm
parents 1dba73f6 b23a35a3

docs/html/google/play-services/reference/packages.jd

deleted100644 → 0
+0 −6
Original line number Diff line number Diff line 
page.title=Reference

@jd:body



<p>

    See offline docs

</p>
 
 No newline at end of file

docs/html/reference/com/google/android/gcm/GCMBaseIntentService.html

+82 −65
Original line number Diff line number Diff line
@@ -52,6 +52,35 @@
@@ -82,28 +111,44 @@ 


<!-- STYLESHEETS -->

<link rel="stylesheet"

href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold" title="roboto">

href="//fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold" title="roboto">

<link href="/assets/css/default.css" rel="stylesheet" type="text/css">







<!-- JAVASCRIPT -->

<script src="//www.google.com/jsapi" type="text/javascript"></script>

<script src="/assets/js/global-libraries-combined.js" type="text/javascript"></script>

<script src="/assets/js/android_3p-bundle.js" type="text/javascript"></script>

<script type="text/javascript">

  var toRoot = "/";

  

  var devsite = false;

  

</script>

<script src="/assets/js/docs.js" type="text/javascript"></script>



<script src="/gms_navtree_data.js" type="text/javascript"></script>

<script src="/gcm_navtree_data.js" type="text/javascript"></script>





<script type="text/javascript">

  var _gaq = _gaq || [];

  _gaq.push(['_setAccount', 'UA-5831155-1']);

  _gaq.push(['_trackPageview']);



  (function() {

    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;

    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';

    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);

  })();

</script>

</head>

<body class="gc-documentation google

  develop" itemscope itemtype="http://schema.org/Article">

  <div id="doc-api-level" class="" style="display:none"></div>

  <a name="top"></a>



  

    <!-- Header -->

    <div id="header">

        <div class="wrap" id="header-wrap">
@@ -164,11 +209,11 @@ href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,m 
        <li class="active"><a>Android Developers</a></li>

        <li><a href="http://source.android.com">Android Open Source Project</a></li>

      </ul>

      <!-- <div class="header">Support</div>

      <ul>

        <li><a href="/support.html">Developer Support</a></li>

      </ul> -->

      <div class="header">Languages</div>

      



      

      

        <div class="header">Language</div>

          <div id="language" class="locales">

            <select name="language" onChange="changeLangPref(this.value, true)">

                <option value="en">English</option>
@@ -185,6 +230,10 @@ href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,m 
          loadLangPref();

            //-->

        </script>

      

      





      <br class="clearfix" />

    </div>

    <div class="bottom"></div>
@@ -530,6 +579,7 @@ onkeyup="return search_changed(event, false, '/')" /> 
       showGoogleRefTree();

    

      </script>



    </div> <!-- end side-nav -->

    <script>

      $(document).ready(function() {
@@ -539,11 +589,6 @@ onkeyup="return search_changed(event, false, '/')" /> 




     

    <script>

      $(document).ready(function() {

        changeDocLang(getLangPref());

        });

    </script>
@@ -5560,6 +5605,7 @@ From interface 
<!-- ========= END OF CLASS DATA ========= -->

<A NAME="navbar_top"></A>





<div id="footer" class="wrap" >
@@ -5570,7 +5616,12 @@ From interface 
  For details and restrictions, see the <a href="/license.html">

  Content License</a>.

  </div>

  <div id="build_info">

    

<script src="/timestamp.js" type="text/javascript"></script>

<script>document.write(BUILD_TIMESTAMP)</script>



  </div>





  <div id="footerlinks">
@@ -5583,6 +5634,7 @@ From interface 
  </div>



</div> <!-- end footer -->



</div> <!-- jd-content -->



</div><!-- end doc-content -->
@@ -5592,41 +5644,6 @@ From interface 






<!-- Grid - for dev 

<script type="text/javascript">



window.gOverride = {

		gColor: '#FF0000',

		pColor: '#EEEEEE',

		gOpacity: 0.10,

		pOpacity: 0.40,

		pHeight: 16,

		pOffset: 2,

		gColumns:16,

		gEnabled:false,

		pEnabled:false

	}

</script>

	

<link href="/assets/js/grid/960.gridder.css" rel="stylesheet" type="text/css">

<script src="/assets/js/grid/960.gridder.js" type="text/javascript"></script>

-->











<script type="text/javascript">

init(); /* initialize android-developer-docs.js */

var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

</script>



<script type="text/javascript">

  var pageTracker = _gat._getTracker("UA-5831155-1");

  pageTracker._trackPageview();

</script>







</body>

docs/html/reference/com/google/android/gcm/GCMBroadcastReceiver.html

+82 −65
Original line number Diff line number Diff line
@@ -52,6 +52,35 @@
@@ -82,28 +111,44 @@ 


<!-- STYLESHEETS -->

<link rel="stylesheet"

href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold" title="roboto">

href="//fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold" title="roboto">

<link href="/assets/css/default.css" rel="stylesheet" type="text/css">







<!-- JAVASCRIPT -->

<script src="//www.google.com/jsapi" type="text/javascript"></script>

<script src="/assets/js/global-libraries-combined.js" type="text/javascript"></script>

<script src="/assets/js/android_3p-bundle.js" type="text/javascript"></script>

<script type="text/javascript">

  var toRoot = "/";

  

  var devsite = false;

  

</script>

<script src="/assets/js/docs.js" type="text/javascript"></script>



<script src="/gms_navtree_data.js" type="text/javascript"></script>

<script src="/gcm_navtree_data.js" type="text/javascript"></script>





<script type="text/javascript">

  var _gaq = _gaq || [];

  _gaq.push(['_setAccount', 'UA-5831155-1']);

  _gaq.push(['_trackPageview']);



  (function() {

    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;

    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';

    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);

  })();

</script>

</head>

<body class="gc-documentation google

  develop" itemscope itemtype="http://schema.org/Article">

  <div id="doc-api-level" class="" style="display:none"></div>

  <a name="top"></a>



  

    <!-- Header -->

    <div id="header">

        <div class="wrap" id="header-wrap">
@@ -164,11 +209,11 @@ href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,m 
        <li class="active"><a>Android Developers</a></li>

        <li><a href="http://source.android.com">Android Open Source Project</a></li>

      </ul>

      <!-- <div class="header">Support</div>

      <ul>

        <li><a href="/support.html">Developer Support</a></li>

      </ul> -->

      <div class="header">Languages</div>

      



      

      

        <div class="header">Language</div>

          <div id="language" class="locales">

            <select name="language" onChange="changeLangPref(this.value, true)">

                <option value="en">English</option>
@@ -185,6 +230,10 @@ href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,m 
          loadLangPref();

            //-->

        </script>

      

      





      <br class="clearfix" />

    </div>

    <div class="bottom"></div>
@@ -530,6 +579,7 @@ onkeyup="return search_changed(event, false, '/')" /> 
       showGoogleRefTree();

    

      </script>



    </div> <!-- end side-nav -->

    <script>

      $(document).ready(function() {
@@ -539,11 +589,6 @@ onkeyup="return search_changed(event, false, '/')" /> 




     

    <script>

      $(document).ready(function() {

        changeDocLang(getLangPref());

        });

    </script>
@@ -1494,6 +1539,7 @@ From class 
<!-- ========= END OF CLASS DATA ========= -->

<A NAME="navbar_top"></A>





<div id="footer" class="wrap" >
@@ -1504,7 +1550,12 @@ From class 
  For details and restrictions, see the <a href="/license.html">

  Content License</a>.

  </div>

  <div id="build_info">

    

<script src="/timestamp.js" type="text/javascript"></script>

<script>document.write(BUILD_TIMESTAMP)</script>



  </div>





  <div id="footerlinks">
@@ -1517,6 +1568,7 @@ From class 
  </div>



</div> <!-- end footer -->



</div> <!-- jd-content -->



</div><!-- end doc-content -->
@@ -1526,41 +1578,6 @@ From class 






<!-- Grid - for dev 

<script type="text/javascript">



window.gOverride = {

		gColor: '#FF0000',

		pColor: '#EEEEEE',

		gOpacity: 0.10,

		pOpacity: 0.40,

		pHeight: 16,

		pOffset: 2,

		gColumns:16,

		gEnabled:false,

		pEnabled:false

	}

</script>

	

<link href="/assets/js/grid/960.gridder.css" rel="stylesheet" type="text/css">

<script src="/assets/js/grid/960.gridder.js" type="text/javascript"></script>

-->











<script type="text/javascript">

init(); /* initialize android-developer-docs.js */

var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

</script>



<script type="text/javascript">

  var pageTracker = _gat._getTracker("UA-5831155-1");

  pageTracker._trackPageview();

</script>







</body>

docs/html/reference/com/google/android/gcm/GCMConstants.html

+82 −65
Original line number Diff line number Diff line
@@ -52,6 +52,35 @@
@@ -82,28 +111,44 @@ 


<!-- STYLESHEETS -->

<link rel="stylesheet"

href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold" title="roboto">

href="//fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold" title="roboto">

<link href="/assets/css/default.css" rel="stylesheet" type="text/css">







<!-- JAVASCRIPT -->

<script src="//www.google.com/jsapi" type="text/javascript"></script>

<script src="/assets/js/global-libraries-combined.js" type="text/javascript"></script>

<script src="/assets/js/android_3p-bundle.js" type="text/javascript"></script>

<script type="text/javascript">

  var toRoot = "/";

  

  var devsite = false;

  

</script>

<script src="/assets/js/docs.js" type="text/javascript"></script>



<script src="/gms_navtree_data.js" type="text/javascript"></script>

<script src="/gcm_navtree_data.js" type="text/javascript"></script>





<script type="text/javascript">

  var _gaq = _gaq || [];

  _gaq.push(['_setAccount', 'UA-5831155-1']);

  _gaq.push(['_trackPageview']);



  (function() {

    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;

    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';

    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);

  })();

</script>

</head>

<body class="gc-documentation google

  develop" itemscope itemtype="http://schema.org/Article">

  <div id="doc-api-level" class="" style="display:none"></div>

  <a name="top"></a>



  

    <!-- Header -->

    <div id="header">

        <div class="wrap" id="header-wrap">
@@ -164,11 +209,11 @@ href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,m 
        <li class="active"><a>Android Developers</a></li>

        <li><a href="http://source.android.com">Android Open Source Project</a></li>

      </ul>

      <!-- <div class="header">Support</div>

      <ul>

        <li><a href="/support.html">Developer Support</a></li>

      </ul> -->

      <div class="header">Languages</div>

      



      

      

        <div class="header">Language</div>

          <div id="language" class="locales">

            <select name="language" onChange="changeLangPref(this.value, true)">

                <option value="en">English</option>
@@ -185,6 +230,10 @@ href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,m 
          loadLangPref();

            //-->

        </script>

      

      





      <br class="clearfix" />

    </div>

    <div class="bottom"></div>
@@ -530,6 +579,7 @@ onkeyup="return search_changed(event, false, '/')" /> 
       showGoogleRefTree();

    

      </script>



    </div> <!-- end side-nav -->

    <script>

      $(document).ready(function() {
@@ -539,11 +589,6 @@ onkeyup="return search_changed(event, false, '/')" /> 




     

    <script>

      $(document).ready(function() {

        changeDocLang(getLangPref());

        });

    </script>
@@ -2019,6 +2064,7 @@ From class 
<!-- ========= END OF CLASS DATA ========= -->

<A NAME="navbar_top"></A>





<div id="footer" class="wrap" >
@@ -2029,7 +2075,12 @@ From class 
  For details and restrictions, see the <a href="/license.html">

  Content License</a>.

  </div>

  <div id="build_info">

    

<script src="/timestamp.js" type="text/javascript"></script>

<script>document.write(BUILD_TIMESTAMP)</script>



  </div>





  <div id="footerlinks">
@@ -2042,6 +2093,7 @@ From class 
  </div>



</div> <!-- end footer -->



</div> <!-- jd-content -->



</div><!-- end doc-content -->
@@ -2051,41 +2103,6 @@ From class 






<!-- Grid - for dev 

<script type="text/javascript">



window.gOverride = {

		gColor: '#FF0000',

		pColor: '#EEEEEE',

		gOpacity: 0.10,

		pOpacity: 0.40,

		pHeight: 16,

		pOffset: 2,

		gColumns:16,

		gEnabled:false,

		pEnabled:false

	}

</script>

	

<link href="/assets/js/grid/960.gridder.css" rel="stylesheet" type="text/css">

<script src="/assets/js/grid/960.gridder.js" type="text/javascript"></script>

-->











<script type="text/javascript">

init(); /* initialize android-developer-docs.js */

var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

</script>



<script type="text/javascript">

  var pageTracker = _gat._getTracker("UA-5831155-1");

  pageTracker._trackPageview();

</script>







</body>

docs/html/reference/com/google/android/gcm/GCMRegistrar.html

+82 −65
Original line number Diff line number Diff line
@@ -52,6 +52,35 @@
@@ -82,28 +111,44 @@ 


<!-- STYLESHEETS -->

<link rel="stylesheet"

href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold" title="roboto">

href="//fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,mediumitalic,bold" title="roboto">

<link href="/assets/css/default.css" rel="stylesheet" type="text/css">







<!-- JAVASCRIPT -->

<script src="//www.google.com/jsapi" type="text/javascript"></script>

<script src="/assets/js/global-libraries-combined.js" type="text/javascript"></script>

<script src="/assets/js/android_3p-bundle.js" type="text/javascript"></script>

<script type="text/javascript">

  var toRoot = "/";

  

  var devsite = false;

  

</script>

<script src="/assets/js/docs.js" type="text/javascript"></script>



<script src="/gms_navtree_data.js" type="text/javascript"></script>

<script src="/gcm_navtree_data.js" type="text/javascript"></script>





<script type="text/javascript">

  var _gaq = _gaq || [];

  _gaq.push(['_setAccount', 'UA-5831155-1']);

  _gaq.push(['_trackPageview']);



  (function() {

    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;

    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';

    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);

  })();

</script>

</head>

<body class="gc-documentation google

  develop" itemscope itemtype="http://schema.org/Article">

  <div id="doc-api-level" class="" style="display:none"></div>

  <a name="top"></a>



  

    <!-- Header -->

    <div id="header">

        <div class="wrap" id="header-wrap">
@@ -164,11 +209,11 @@ href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,m 
        <li class="active"><a>Android Developers</a></li>

        <li><a href="http://source.android.com">Android Open Source Project</a></li>

      </ul>

      <!-- <div class="header">Support</div>

      <ul>

        <li><a href="/support.html">Developer Support</a></li>

      </ul> -->

      <div class="header">Languages</div>

      



      

      

        <div class="header">Language</div>

          <div id="language" class="locales">

            <select name="language" onChange="changeLangPref(this.value, true)">

                <option value="en">English</option>
@@ -185,6 +230,10 @@ href="http://fonts.googleapis.com/css?family=Roboto:regular,medium,thin,italic,m 
          loadLangPref();

            //-->

        </script>

      

      





      <br class="clearfix" />

    </div>

    <div class="bottom"></div>
@@ -530,6 +579,7 @@ onkeyup="return search_changed(event, false, '/')" /> 
       showGoogleRefTree();

    

      </script>



    </div> <!-- end side-nav -->

    <script>

      $(document).ready(function() {
@@ -539,11 +589,6 @@ onkeyup="return search_changed(event, false, '/')" /> 




     

    <script>

      $(document).ready(function() {

        changeDocLang(getLangPref());

        });

    </script>
@@ -1698,6 +1743,7 @@ From class 
<!-- ========= END OF CLASS DATA ========= -->

<A NAME="navbar_top"></A>





<div id="footer" class="wrap" >
@@ -1708,7 +1754,12 @@ From class 
  For details and restrictions, see the <a href="/license.html">

  Content License</a>.

  </div>

  <div id="build_info">

    

<script src="/timestamp.js" type="text/javascript"></script>

<script>document.write(BUILD_TIMESTAMP)</script>



  </div>





  <div id="footerlinks">
@@ -1721,6 +1772,7 @@ From class 
  </div>



</div> <!-- end footer -->



</div> <!-- jd-content -->



</div><!-- end doc-content -->
@@ -1730,41 +1782,6 @@ From class 






<!-- Grid - for dev 

<script type="text/javascript">



window.gOverride = {

		gColor: '#FF0000',

		pColor: '#EEEEEE',

		gOpacity: 0.10,

		pOpacity: 0.40,

		pHeight: 16,

		pOffset: 2,

		gColumns:16,

		gEnabled:false,

		pEnabled:false

	}

</script>

	

<link href="/assets/js/grid/960.gridder.css" rel="stylesheet" type="text/css">

<script src="/assets/js/grid/960.gridder.js" type="text/javascript"></script>

-->











<script type="text/javascript">

init(); /* initialize android-developer-docs.js */

var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");

document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));

</script>



<script type="text/javascript">

  var pageTracker = _gat._getTracker("UA-5831155-1");

  pageTracker._trackPageview();

</script>







</body>