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

Commit 6b79e954 authored by Robert Ly's avatar Robert Ly Committed by Android (Google) Code Review
Browse files

Merge "docs: update gms and gcm javadocs with new TOC" into jb-mr1-dev

parents 3e2479dd d84d5ccd

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

+75 −54
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ onkeyup="return search_changed(event, false, '/')" /> 


  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play-services/index.html">

      <span class="en">Google Play services</span></a>

      <span class="en">Google Play Services</span></a>

    </div>

    <ul>

      <li><a href="/google/play-services/setup.html">
@@ -390,19 +390,34 @@ onkeyup="return search_changed(event, false, '/')" /> 
    </ul>

  </li>





  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play/billing/index.html">

      <span class="en">Google Play In-app Billing</span></a>

    </div>

    <ul>

      <li><a href="/google/play/billing/billing_overview.html">

              <span class="en">In-app Billing Overview</span></a>

              <span class="en">Overview</span></a>

      </li>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/api.html">

              <span class="en">Version 3 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/billing_integrate.html">

              <span class="en">Implementing In-app Billing</span></a>

              <span class="en">Implementing the API</span></a></li>

              <li><a href="/google/play/billing/billing_reference.html">

              <span class="en">Reference</span></a></li>

              </ul>

      </li>

          <li><a href="/google/play/billing/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/v2/api.html">

              <span class="en">Version 2 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/v2/billing_integrate.html">

              <span class="en">Implementing the API</span></a></li>

              <li><a href="/google/play/billing/v2/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a></li>

              <li><a href="/google/play/billing/v2/billing_reference.html">

              <span class="en">Reference</span></a></li>

              </ul>

      </li>

      <li><a href="/google/play/billing/billing_best_practices.html">

              <span class="en">Security and Design</span></a>
@@ -413,8 +428,8 @@ onkeyup="return search_changed(event, false, '/')" /> 
      <li><a href="/google/play/billing/billing_admin.html">

              <span class="en">Administering In-app Billing</span></a>

      </li>

          <li><a href="/google/play/billing/billing_reference.html">

              <span class="en">Reference</span></a>

      <li><a href="/google/play/billing/versions.html">

              <span class="en">Version Notes</span></a>

      </li>

    </ul>

  </li>
@@ -431,11 +446,9 @@ onkeyup="return search_changed(event, false, '/')" /> 
      <li><a href="/google/play/publishing/multiple-apks.html">

          <span class="en">Multiple APK Support</span></a>

      </li>



      <li><a href="/google/play/expansion-files.html">

          <span class="en">APK Expansion Files</span></a>

      </li>



      <li class="nav-section">

        <div class="nav-section-header"><a href="/google/play/licensing/index.html">

          <span class="en">Application Licensing</span></a>
@@ -456,7 +469,7 @@ onkeyup="return search_changed(event, false, '/')" /> 
        </ul>

      </li>

    </ul>



  </li>



  <li class="nav-section">

      <div class="nav-section-header"><a href="/google/gcm/index.html">
@@ -485,9 +498,21 @@ onkeyup="return search_changed(event, false, '/')" /> 
            </a>

          <div>

        </li>

      </ul>

  </li>





  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/backup/index.html">

      Android Backup Service</a>

    </div>

    <ul>

      <li><a href="/google/backup/signup.html">

          Register</a>

      </li>

    </ul>

  </li>



</ul>



<script type="text/javascript">
@@ -5545,11 +5570,7 @@ From interface 
  For details and restrictions, see the <a href="/license.html">

  Content License</a>.

  </div>

  <div id="build_info">

  

    Android &nbsp;r &mdash; 03 Dec 2012 12:15



  </div>





  <div id="footerlinks">

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

+75 −54
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ onkeyup="return search_changed(event, false, '/')" /> 


  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play-services/index.html">

      <span class="en">Google Play services</span></a>

      <span class="en">Google Play Services</span></a>

    </div>

    <ul>

      <li><a href="/google/play-services/setup.html">
@@ -390,19 +390,34 @@ onkeyup="return search_changed(event, false, '/')" /> 
    </ul>

  </li>





  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play/billing/index.html">

      <span class="en">Google Play In-app Billing</span></a>

    </div>

    <ul>

      <li><a href="/google/play/billing/billing_overview.html">

              <span class="en">In-app Billing Overview</span></a>

              <span class="en">Overview</span></a>

      </li>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/api.html">

              <span class="en">Version 3 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/billing_integrate.html">

              <span class="en">Implementing In-app Billing</span></a>

              <span class="en">Implementing the API</span></a></li>

              <li><a href="/google/play/billing/billing_reference.html">

              <span class="en">Reference</span></a></li>

              </ul>

      </li>

          <li><a href="/google/play/billing/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/v2/api.html">

              <span class="en">Version 2 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/v2/billing_integrate.html">

              <span class="en">Implementing the API</span></a></li>

              <li><a href="/google/play/billing/v2/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a></li>

              <li><a href="/google/play/billing/v2/billing_reference.html">

              <span class="en">Reference</span></a></li>

              </ul>

      </li>

      <li><a href="/google/play/billing/billing_best_practices.html">

              <span class="en">Security and Design</span></a>
@@ -413,8 +428,8 @@ onkeyup="return search_changed(event, false, '/')" /> 
      <li><a href="/google/play/billing/billing_admin.html">

              <span class="en">Administering In-app Billing</span></a>

      </li>

          <li><a href="/google/play/billing/billing_reference.html">

              <span class="en">Reference</span></a>

      <li><a href="/google/play/billing/versions.html">

              <span class="en">Version Notes</span></a>

      </li>

    </ul>

  </li>
@@ -431,11 +446,9 @@ onkeyup="return search_changed(event, false, '/')" /> 
      <li><a href="/google/play/publishing/multiple-apks.html">

          <span class="en">Multiple APK Support</span></a>

      </li>



      <li><a href="/google/play/expansion-files.html">

          <span class="en">APK Expansion Files</span></a>

      </li>



      <li class="nav-section">

        <div class="nav-section-header"><a href="/google/play/licensing/index.html">

          <span class="en">Application Licensing</span></a>
@@ -456,7 +469,7 @@ onkeyup="return search_changed(event, false, '/')" /> 
        </ul>

      </li>

    </ul>



  </li>



  <li class="nav-section">

      <div class="nav-section-header"><a href="/google/gcm/index.html">
@@ -485,9 +498,21 @@ onkeyup="return search_changed(event, false, '/')" /> 
            </a>

          <div>

        </li>

      </ul>

  </li>





  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/backup/index.html">

      Android Backup Service</a>

    </div>

    <ul>

      <li><a href="/google/backup/signup.html">

          Register</a>

      </li>

    </ul>

  </li>



</ul>



<script type="text/javascript">
@@ -1479,11 +1504,7 @@ From class 
  For details and restrictions, see the <a href="/license.html">

  Content License</a>.

  </div>

  <div id="build_info">

  

    Android &nbsp;r &mdash; 03 Dec 2012 12:15



  </div>





  <div id="footerlinks">

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

+75 −54
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ onkeyup="return search_changed(event, false, '/')" /> 


  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play-services/index.html">

      <span class="en">Google Play services</span></a>

      <span class="en">Google Play Services</span></a>

    </div>

    <ul>

      <li><a href="/google/play-services/setup.html">
@@ -390,19 +390,34 @@ onkeyup="return search_changed(event, false, '/')" /> 
    </ul>

  </li>





  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play/billing/index.html">

      <span class="en">Google Play In-app Billing</span></a>

    </div>

    <ul>

      <li><a href="/google/play/billing/billing_overview.html">

              <span class="en">In-app Billing Overview</span></a>

              <span class="en">Overview</span></a>

      </li>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/api.html">

              <span class="en">Version 3 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/billing_integrate.html">

              <span class="en">Implementing In-app Billing</span></a>

              <span class="en">Implementing the API</span></a></li>

              <li><a href="/google/play/billing/billing_reference.html">

              <span class="en">Reference</span></a></li>

              </ul>

      </li>

          <li><a href="/google/play/billing/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/v2/api.html">

              <span class="en">Version 2 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/v2/billing_integrate.html">

              <span class="en">Implementing the API</span></a></li>

              <li><a href="/google/play/billing/v2/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a></li>

              <li><a href="/google/play/billing/v2/billing_reference.html">

              <span class="en">Reference</span></a></li>

              </ul>

      </li>

      <li><a href="/google/play/billing/billing_best_practices.html">

              <span class="en">Security and Design</span></a>
@@ -413,8 +428,8 @@ onkeyup="return search_changed(event, false, '/')" /> 
      <li><a href="/google/play/billing/billing_admin.html">

              <span class="en">Administering In-app Billing</span></a>

      </li>

          <li><a href="/google/play/billing/billing_reference.html">

              <span class="en">Reference</span></a>

      <li><a href="/google/play/billing/versions.html">

              <span class="en">Version Notes</span></a>

      </li>

    </ul>

  </li>
@@ -431,11 +446,9 @@ onkeyup="return search_changed(event, false, '/')" /> 
      <li><a href="/google/play/publishing/multiple-apks.html">

          <span class="en">Multiple APK Support</span></a>

      </li>



      <li><a href="/google/play/expansion-files.html">

          <span class="en">APK Expansion Files</span></a>

      </li>



      <li class="nav-section">

        <div class="nav-section-header"><a href="/google/play/licensing/index.html">

          <span class="en">Application Licensing</span></a>
@@ -456,7 +469,7 @@ onkeyup="return search_changed(event, false, '/')" /> 
        </ul>

      </li>

    </ul>



  </li>



  <li class="nav-section">

      <div class="nav-section-header"><a href="/google/gcm/index.html">
@@ -485,9 +498,21 @@ onkeyup="return search_changed(event, false, '/')" /> 
            </a>

          <div>

        </li>

      </ul>

  </li>





  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/backup/index.html">

      Android Backup Service</a>

    </div>

    <ul>

      <li><a href="/google/backup/signup.html">

          Register</a>

      </li>

    </ul>

  </li>



</ul>



<script type="text/javascript">
@@ -2004,11 +2029,7 @@ From class 
  For details and restrictions, see the <a href="/license.html">

  Content License</a>.

  </div>

  <div id="build_info">

  

    Android &nbsp;r &mdash; 03 Dec 2012 12:15



  </div>





  <div id="footerlinks">

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

+75 −54
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ onkeyup="return search_changed(event, false, '/')" /> 


  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play-services/index.html">

      <span class="en">Google Play services</span></a>

      <span class="en">Google Play Services</span></a>

    </div>

    <ul>

      <li><a href="/google/play-services/setup.html">
@@ -390,19 +390,34 @@ onkeyup="return search_changed(event, false, '/')" /> 
    </ul>

  </li>





  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play/billing/index.html">

      <span class="en">Google Play In-app Billing</span></a>

    </div>

    <ul>

      <li><a href="/google/play/billing/billing_overview.html">

              <span class="en">In-app Billing Overview</span></a>

              <span class="en">Overview</span></a>

      </li>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/api.html">

              <span class="en">Version 3 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/billing_integrate.html">

              <span class="en">Implementing In-app Billing</span></a>

              <span class="en">Implementing the API</span></a></li>

              <li><a href="/google/play/billing/billing_reference.html">

              <span class="en">Reference</span></a></li>

              </ul>

      </li>

          <li><a href="/google/play/billing/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/v2/api.html">

              <span class="en">Version 2 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/v2/billing_integrate.html">

              <span class="en">Implementing the API</span></a></li>

              <li><a href="/google/play/billing/v2/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a></li>

              <li><a href="/google/play/billing/v2/billing_reference.html">

              <span class="en">Reference</span></a></li>

              </ul>

      </li>

      <li><a href="/google/play/billing/billing_best_practices.html">

              <span class="en">Security and Design</span></a>
@@ -413,8 +428,8 @@ onkeyup="return search_changed(event, false, '/')" /> 
      <li><a href="/google/play/billing/billing_admin.html">

              <span class="en">Administering In-app Billing</span></a>

      </li>

          <li><a href="/google/play/billing/billing_reference.html">

              <span class="en">Reference</span></a>

      <li><a href="/google/play/billing/versions.html">

              <span class="en">Version Notes</span></a>

      </li>

    </ul>

  </li>
@@ -431,11 +446,9 @@ onkeyup="return search_changed(event, false, '/')" /> 
      <li><a href="/google/play/publishing/multiple-apks.html">

          <span class="en">Multiple APK Support</span></a>

      </li>



      <li><a href="/google/play/expansion-files.html">

          <span class="en">APK Expansion Files</span></a>

      </li>



      <li class="nav-section">

        <div class="nav-section-header"><a href="/google/play/licensing/index.html">

          <span class="en">Application Licensing</span></a>
@@ -456,7 +469,7 @@ onkeyup="return search_changed(event, false, '/')" /> 
        </ul>

      </li>

    </ul>



  </li>



  <li class="nav-section">

      <div class="nav-section-header"><a href="/google/gcm/index.html">
@@ -485,9 +498,21 @@ onkeyup="return search_changed(event, false, '/')" /> 
            </a>

          <div>

        </li>

      </ul>

  </li>





  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/backup/index.html">

      Android Backup Service</a>

    </div>

    <ul>

      <li><a href="/google/backup/signup.html">

          Register</a>

      </li>

    </ul>

  </li>



</ul>



<script type="text/javascript">
@@ -1683,11 +1708,7 @@ From class 
  For details and restrictions, see the <a href="/license.html">

  Content License</a>.

  </div>

  <div id="build_info">

  

    Android &nbsp;r &mdash; 03 Dec 2012 12:15



  </div>





  <div id="footerlinks">

docs/html/reference/com/google/android/gcm/package-summary.html

+75 −54
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ onkeyup="return search_changed(event, false, '/')" /> 


  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play-services/index.html">

      <span class="en">Google Play services</span></a>

      <span class="en">Google Play Services</span></a>

    </div>

    <ul>

      <li><a href="/google/play-services/setup.html">
@@ -391,19 +391,34 @@ onkeyup="return search_changed(event, false, '/')" /> 
    </ul>

  </li>





  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/play/billing/index.html">

      <span class="en">Google Play In-app Billing</span></a>

    </div>

    <ul>

      <li><a href="/google/play/billing/billing_overview.html">

              <span class="en">In-app Billing Overview</span></a>

              <span class="en">Overview</span></a>

      </li>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/api.html">

              <span class="en">Version 3 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/billing_integrate.html">

              <span class="en">Implementing In-app Billing</span></a>

              <span class="en">Implementing the API</span></a></li>

              <li><a href="/google/play/billing/billing_reference.html">

              <span class="en">Reference</span></a></li>

              </ul>

      </li>

          <li><a href="/google/play/billing/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a>

      <li class="nav-section"><div class="nav-section-header"><a href="/google/play/billing/v2/api.html">

              <span class="en">Version 2 API</span></a></div>

              <ul>

              <li><a href="/google/play/billing/v2/billing_integrate.html">

              <span class="en">Implementing the API</span></a></li>

              <li><a href="/google/play/billing/v2/billing_subscriptions.html">

              <span class="en">Subscriptions</span></a></li>

              <li><a href="/google/play/billing/v2/billing_reference.html">

              <span class="en">Reference</span></a></li>

              </ul>

      </li>

      <li><a href="/google/play/billing/billing_best_practices.html">

              <span class="en">Security and Design</span></a>
@@ -414,8 +429,8 @@ onkeyup="return search_changed(event, false, '/')" /> 
      <li><a href="/google/play/billing/billing_admin.html">

              <span class="en">Administering In-app Billing</span></a>

      </li>

          <li><a href="/google/play/billing/billing_reference.html">

              <span class="en">Reference</span></a>

      <li><a href="/google/play/billing/versions.html">

              <span class="en">Version Notes</span></a>

      </li>

    </ul>

  </li>
@@ -432,11 +447,9 @@ onkeyup="return search_changed(event, false, '/')" /> 
      <li><a href="/google/play/publishing/multiple-apks.html">

          <span class="en">Multiple APK Support</span></a>

      </li>



      <li><a href="/google/play/expansion-files.html">

          <span class="en">APK Expansion Files</span></a>

      </li>



      <li class="nav-section">

        <div class="nav-section-header"><a href="/google/play/licensing/index.html">

          <span class="en">Application Licensing</span></a>
@@ -457,7 +470,7 @@ onkeyup="return search_changed(event, false, '/')" /> 
        </ul>

      </li>

    </ul>



  </li>



  <li class="nav-section">

      <div class="nav-section-header"><a href="/google/gcm/index.html">
@@ -486,9 +499,21 @@ onkeyup="return search_changed(event, false, '/')" /> 
            </a>

          <div>

        </li>

      </ul>

  </li>





  <li class="nav-section">

    <div class="nav-section-header"><a href="/google/backup/index.html">

      Android Backup Service</a>

    </div>

    <ul>

      <li><a href="/google/backup/signup.html">

          Register</a>

      </li>

    </ul>

  </li>



</ul>



<script type="text/javascript">
@@ -598,11 +623,7 @@ onkeyup="return search_changed(event, false, '/')" /> 
  For details and restrictions, see the <a href="/license.html">

  Content License</a>.

  </div>

  <div id="build_info">

  

    Android &nbsp;r &mdash; 03 Dec 2012 12:15



  </div>





  <div id="footerlinks">