Skip to content

Commit d81751f

Browse files
Robert LyAndroid (Google) Code Review
authored andcommitted
Merge "docs: add javadocs for gcm" into jb-mr1-dev
2 parents 1a9e7a6 + 4779ffa commit d81751f

15 files changed

+60
-1329
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,13 @@ <h2 id="searchTitle">Results</h2>
408408
<span class="en">Security and Design</span></a>
409409
</li>
410410
<li><a href="/google/play/billing/billing_testing.html">
411-
<span class="en">Testing <br/>In-app Billing</span></a>
411+
<span class="en">Testing In-app Billing</span></a>
412412
</li>
413413
<li><a href="/google/play/billing/billing_admin.html">
414414
<span class="en">Administering In-app Billing</span></a>
415415
</li>
416416
<li><a href="/google/play/billing/billing_reference.html">
417-
<span class="en">In-app Billing Reference</span></a>
417+
<span class="en">Reference</span></a>
418418
</li>
419419
</ul>
420420
</li>
@@ -5547,7 +5547,7 @@ <h5 class="jd-tagtitle">Parameters</h5>
55475547
</div>
55485548
<div id="build_info">
55495549

5550-
Android &nbsp;r - 30 Nov 2012 16:06
5550+
Android &nbsp;r &mdash; 02 Dec 2012 17:05
55515551

55525552
</div>
55535553

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,13 @@ <h2 id="searchTitle">Results</h2>
408408
<span class="en">Security and Design</span></a>
409409
</li>
410410
<li><a href="/google/play/billing/billing_testing.html">
411-
<span class="en">Testing <br/>In-app Billing</span></a>
411+
<span class="en">Testing In-app Billing</span></a>
412412
</li>
413413
<li><a href="/google/play/billing/billing_admin.html">
414414
<span class="en">Administering In-app Billing</span></a>
415415
</li>
416416
<li><a href="/google/play/billing/billing_reference.html">
417-
<span class="en">In-app Billing Reference</span></a>
417+
<span class="en">Reference</span></a>
418418
</li>
419419
</ul>
420420
</li>
@@ -1481,7 +1481,7 @@ <h4 class="jd-details-title">
14811481
</div>
14821482
<div id="build_info">
14831483

1484-
Android &nbsp;r - 30 Nov 2012 16:06
1484+
Android &nbsp;r &mdash; 02 Dec 2012 17:05
14851485

14861486
</div>
14871487

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,13 @@ <h2 id="searchTitle">Results</h2>
408408
<span class="en">Security and Design</span></a>
409409
</li>
410410
<li><a href="/google/play/billing/billing_testing.html">
411-
<span class="en">Testing <br/>In-app Billing</span></a>
411+
<span class="en">Testing In-app Billing</span></a>
412412
</li>
413413
<li><a href="/google/play/billing/billing_admin.html">
414414
<span class="en">Administering In-app Billing</span></a>
415415
</li>
416416
<li><a href="/google/play/billing/billing_reference.html">
417-
<span class="en">In-app Billing Reference</span></a>
417+
<span class="en">Reference</span></a>
418418
</li>
419419
</ul>
420420
</li>
@@ -726,7 +726,7 @@ <h2>Summary</h2>
726726
<td class="jd-typecol">String</td>
727727
<td class="jd-linkcol"><a href="/reference/com/google/android/gcm/GCMConstants.html#EXTRA_APPLICATION_PENDING_INTENT">EXTRA_APPLICATION_PENDING_INTENT</a></td>
728728
<td class="jd-descrcol" width="100%">Extra used on
729-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_TO_GCM_REGISTRATION</a></code>
729+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_TO_GCM_REGISTRATION">com.google.android.gcm.GCMConstants.INTENT_TO_GCM_REGISTRATION</a></code>
730730
to get the application info.</td>
731731
</tr>
732732

@@ -735,7 +735,7 @@ <h2>Summary</h2>
735735
<td class="jd-typecol">String</td>
736736
<td class="jd-linkcol"><a href="/reference/com/google/android/gcm/GCMConstants.html#EXTRA_ERROR">EXTRA_ERROR</a></td>
737737
<td class="jd-descrcol" width="100%">Extra used on
738-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
738+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_REGISTRATION_CALLBACK">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
739739
to indicate an error when the registration fails.</td>
740740
</tr>
741741

@@ -744,7 +744,7 @@ <h2>Summary</h2>
744744
<td class="jd-typecol">String</td>
745745
<td class="jd-linkcol"><a href="/reference/com/google/android/gcm/GCMConstants.html#EXTRA_FROM">EXTRA_FROM</a></td>
746746
<td class="jd-descrcol" width="100%">Extra used on
747-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_MESSAGE</a></code>
747+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_MESSAGE">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_MESSAGE</a></code>
748748
to indicate which sender (Google API project id) sent the message.</td>
749749
</tr>
750750

@@ -753,7 +753,7 @@ <h2>Summary</h2>
753753
<td class="jd-typecol">String</td>
754754
<td class="jd-linkcol"><a href="/reference/com/google/android/gcm/GCMConstants.html#EXTRA_REGISTRATION_ID">EXTRA_REGISTRATION_ID</a></td>
755755
<td class="jd-descrcol" width="100%">Extra used on
756-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
756+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_REGISTRATION_CALLBACK">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
757757
to indicate the registration id when the registration succeeds.</td>
758758
</tr>
759759

@@ -762,7 +762,7 @@ <h2>Summary</h2>
762762
<td class="jd-typecol">String</td>
763763
<td class="jd-linkcol"><a href="/reference/com/google/android/gcm/GCMConstants.html#EXTRA_SENDER">EXTRA_SENDER</a></td>
764764
<td class="jd-descrcol" width="100%">Extra used on
765-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_TO_GCM_REGISTRATION</a></code>
765+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_TO_GCM_REGISTRATION">com.google.android.gcm.GCMConstants.INTENT_TO_GCM_REGISTRATION</a></code>
766766
to indicate which senders (Google API project ids) can send messages to
767767
the application.</td>
768768
</tr>
@@ -772,7 +772,7 @@ <h2>Summary</h2>
772772
<td class="jd-typecol">String</td>
773773
<td class="jd-linkcol"><a href="/reference/com/google/android/gcm/GCMConstants.html#EXTRA_SPECIAL_MESSAGE">EXTRA_SPECIAL_MESSAGE</a></td>
774774
<td class="jd-descrcol" width="100%">Type of message present in the
775-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_MESSAGE</a></code>
775+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_MESSAGE">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_MESSAGE</a></code>
776776
intent.</td>
777777
</tr>
778778

@@ -788,7 +788,7 @@ <h2>Summary</h2>
788788
<td class="jd-typecol">String</td>
789789
<td class="jd-linkcol"><a href="/reference/com/google/android/gcm/GCMConstants.html#EXTRA_UNREGISTERED">EXTRA_UNREGISTERED</a></td>
790790
<td class="jd-descrcol" width="100%">Extra used on
791-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
791+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_REGISTRATION_CALLBACK">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
792792
to indicate that the application has been unregistered.</td>
793793
</tr>
794794

@@ -1399,7 +1399,7 @@ <h4 class="jd-details-title">
13991399
<div class="jd-details-descr">
14001400

14011401
<div class="jd-tagdata jd-tagdescr"><p>Extra used on
1402-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_TO_GCM_REGISTRATION</a></code>
1402+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_TO_GCM_REGISTRATION">com.google.android.gcm.GCMConstants.INTENT_TO_GCM_REGISTRATION</a></code>
14031403
to get the application info.
14041404
</p></div>
14051405

@@ -1439,7 +1439,7 @@ <h4 class="jd-details-title">
14391439
<div class="jd-details-descr">
14401440

14411441
<div class="jd-tagdata jd-tagdescr"><p>Extra used on
1442-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
1442+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_REGISTRATION_CALLBACK">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
14431443
to indicate an error when the registration fails.
14441444
See constants starting with ERROR_ for possible values.
14451445
</p></div>
@@ -1480,7 +1480,7 @@ <h4 class="jd-details-title">
14801480
<div class="jd-details-descr">
14811481

14821482
<div class="jd-tagdata jd-tagdescr"><p>Extra used on
1483-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_MESSAGE</a></code>
1483+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_MESSAGE">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_MESSAGE</a></code>
14841484
to indicate which sender (Google API project id) sent the message.
14851485
</p></div>
14861486

@@ -1520,7 +1520,7 @@ <h4 class="jd-details-title">
15201520
<div class="jd-details-descr">
15211521

15221522
<div class="jd-tagdata jd-tagdescr"><p>Extra used on
1523-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
1523+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_REGISTRATION_CALLBACK">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
15241524
to indicate the registration id when the registration succeeds.
15251525
</p></div>
15261526

@@ -1560,7 +1560,7 @@ <h4 class="jd-details-title">
15601560
<div class="jd-details-descr">
15611561

15621562
<div class="jd-tagdata jd-tagdescr"><p>Extra used on
1563-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_TO_GCM_REGISTRATION</a></code>
1563+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_TO_GCM_REGISTRATION">com.google.android.gcm.GCMConstants.INTENT_TO_GCM_REGISTRATION</a></code>
15641564
to indicate which senders (Google API project ids) can send messages to
15651565
the application.
15661566
</p></div>
@@ -1601,7 +1601,7 @@ <h4 class="jd-details-title">
16011601
<div class="jd-details-descr">
16021602

16031603
<div class="jd-tagdata jd-tagdescr"><p>Type of message present in the
1604-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_MESSAGE</a></code>
1604+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_MESSAGE">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_MESSAGE</a></code>
16051605
intent.
16061606
This extra is only set for special messages sent from GCM, not for
16071607
messages originated from the application.
@@ -1644,7 +1644,7 @@ <h4 class="jd-details-title">
16441644

16451645
<div class="jd-tagdata jd-tagdescr"><p>Number of messages deleted by the server because the device was idle.
16461646
Present only on messages of special type
1647-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.VALUE_DELETED_MESSAGES</a></code>
1647+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#VALUE_DELETED_MESSAGES">com.google.android.gcm.GCMConstants.VALUE_DELETED_MESSAGES</a></code>
16481648
</p></div>
16491649

16501650

@@ -1683,7 +1683,7 @@ <h4 class="jd-details-title">
16831683
<div class="jd-details-descr">
16841684

16851685
<div class="jd-tagdata jd-tagdescr"><p>Extra used on
1686-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
1686+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_REGISTRATION_CALLBACK">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>
16871687
to indicate that the application has been unregistered.
16881688
</p></div>
16891689

@@ -2006,7 +2006,7 @@ <h4 class="jd-details-title">
20062006
</div>
20072007
<div id="build_info">
20082008

2009-
Android &nbsp;r - 30 Nov 2012 16:06
2009+
Android &nbsp;r &mdash; 02 Dec 2012 17:05
20102010

20112011
</div>
20122012

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,13 @@ <h2 id="searchTitle">Results</h2>
408408
<span class="en">Security and Design</span></a>
409409
</li>
410410
<li><a href="/google/play/billing/billing_testing.html">
411-
<span class="en">Testing <br/>In-app Billing</span></a>
411+
<span class="en">Testing In-app Billing</span></a>
412412
</li>
413413
<li><a href="/google/play/billing/billing_admin.html">
414414
<span class="en">Administering In-app Billing</span></a>
415415
</li>
416416
<li><a href="/google/play/billing/billing_reference.html">
417-
<span class="en">In-app Billing Reference</span></a>
417+
<span class="en">Reference</span></a>
418418
</li>
419419
</ul>
420420
</li>
@@ -1299,12 +1299,12 @@ <h4 class="jd-details-title">
12991299
<li>It defines at least one <code><a href="/reference/android/content/BroadcastReceiver.html">BroadcastReceiver</a></code> with category
13001300
<code>PACKAGE_NAME</code>.
13011301
<li>The <code><a href="/reference/android/content/BroadcastReceiver.html">BroadcastReceiver</a></code>(s) uses the
1302-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.PERMISSION_GCM_INTENTS</a></code>
1302+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#PERMISSION_GCM_INTENTS">com.google.android.gcm.GCMConstants.PERMISSION_GCM_INTENTS</a></code>
13031303
permission.
13041304
<li>The <code><a href="/reference/android/content/BroadcastReceiver.html">BroadcastReceiver</a></code>(s) handles the 2 GCM intents
1305-
(<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_MESSAGE</a></code>
1305+
(<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_MESSAGE">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_MESSAGE</a></code>
13061306
and
1307-
<code class='value'><a href="/">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>).
1307+
<code><a href="/reference/com/google/android/gcm/GCMConstants.html#INTENT_FROM_GCM_REGISTRATION_CALLBACK">com.google.android.gcm.GCMConstants.INTENT_FROM_GCM_REGISTRATION_CALLBACK</a></code>).
13081308
</ol>
13091309
...where <code>PACKAGE_NAME</code> is the application package.
13101310
<p>
@@ -1685,7 +1685,7 @@ <h4 class="jd-details-title">
16851685
</div>
16861686
<div id="build_info">
16871687

1688-
Android &nbsp;r - 30 Nov 2012 16:06
1688+
Android &nbsp;r &mdash; 02 Dec 2012 17:05
16891689

16901690
</div>
16911691

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,13 +409,13 @@ <h2 id="searchTitle">Results</h2>
409409
<span class="en">Security and Design</span></a>
410410
</li>
411411
<li><a href="/google/play/billing/billing_testing.html">
412-
<span class="en">Testing <br/>In-app Billing</span></a>
412+
<span class="en">Testing In-app Billing</span></a>
413413
</li>
414414
<li><a href="/google/play/billing/billing_admin.html">
415415
<span class="en">Administering In-app Billing</span></a>
416416
</li>
417417
<li><a href="/google/play/billing/billing_reference.html">
418-
<span class="en">In-app Billing Reference</span></a>
418+
<span class="en">Reference</span></a>
419419
</li>
420420
</ul>
421421
</li>
@@ -600,7 +600,7 @@ <h2>Classes</h2>
600600
</div>
601601
<div id="build_info">
602602

603-
Android &nbsp;r - 30 Nov 2012 16:06
603+
Android &nbsp;r &mdash; 02 Dec 2012 17:05
604604

605605
</div>
606606

docs/html/reference/com/google/android/gcm/server/Constants.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,13 @@ <h2 id="searchTitle">Results</h2>
408408
<span class="en">Security and Design</span></a>
409409
</li>
410410
<li><a href="/google/play/billing/billing_testing.html">
411-
<span class="en">Testing <br/>In-app Billing</span></a>
411+
<span class="en">Testing In-app Billing</span></a>
412412
</li>
413413
<li><a href="/google/play/billing/billing_admin.html">
414414
<span class="en">Administering In-app Billing</span></a>
415415
</li>
416416
<li><a href="/google/play/billing/billing_reference.html">
417-
<span class="en">In-app Billing Reference</span></a>
417+
<span class="en">Reference</span></a>
418418
</li>
419419
</ul>
420420
</li>
@@ -2291,7 +2291,7 @@ <h4 class="jd-details-title">
22912291
</div>
22922292
<div id="build_info">
22932293

2294-
Android &nbsp;r - 30 Nov 2012 16:06
2294+
Android &nbsp;r &mdash; 02 Dec 2012 17:05
22952295

22962296
</div>
22972297

docs/html/reference/com/google/android/gcm/server/InvalidRequestException.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,13 @@ <h2 id="searchTitle">Results</h2>
408408
<span class="en">Security and Design</span></a>
409409
</li>
410410
<li><a href="/google/play/billing/billing_testing.html">
411-
<span class="en">Testing <br/>In-app Billing</span></a>
411+
<span class="en">Testing In-app Billing</span></a>
412412
</li>
413413
<li><a href="/google/play/billing/billing_admin.html">
414414
<span class="en">Administering In-app Billing</span></a>
415415
</li>
416416
<li><a href="/google/play/billing/billing_reference.html">
417-
<span class="en">In-app Billing Reference</span></a>
417+
<span class="en">Reference</span></a>
418418
</li>
419419
</ul>
420420
</li>
@@ -1451,7 +1451,7 @@ <h4 class="jd-details-title">
14511451
</div>
14521452
<div id="build_info">
14531453

1454-
Android &nbsp;r - 30 Nov 2012 16:06
1454+
Android &nbsp;r &mdash; 02 Dec 2012 17:05
14551455

14561456
</div>
14571457

docs/html/reference/com/google/android/gcm/server/Message.Builder.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,13 @@ <h2 id="searchTitle">Results</h2>
408408
<span class="en">Security and Design</span></a>
409409
</li>
410410
<li><a href="/google/play/billing/billing_testing.html">
411-
<span class="en">Testing <br/>In-app Billing</span></a>
411+
<span class="en">Testing In-app Billing</span></a>
412412
</li>
413413
<li><a href="/google/play/billing/billing_admin.html">
414414
<span class="en">Administering In-app Billing</span></a>
415415
</li>
416416
<li><a href="/google/play/billing/billing_reference.html">
417-
<span class="en">In-app Billing Reference</span></a>
417+
<span class="en">Reference</span></a>
418418
</li>
419419
</ul>
420420
</li>
@@ -1263,7 +1263,7 @@ <h4 class="jd-details-title">
12631263
</div>
12641264
<div id="build_info">
12651265

1266-
Android &nbsp;r - 30 Nov 2012 16:06
1266+
Android &nbsp;r &mdash; 02 Dec 2012 17:05
12671267

12681268
</div>
12691269

docs/html/reference/com/google/android/gcm/server/Message.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -408,13 +408,13 @@ <h2 id="searchTitle">Results</h2>
408408
<span class="en">Security and Design</span></a>
409409
</li>
410410
<li><a href="/google/play/billing/billing_testing.html">
411-
<span class="en">Testing <br/>In-app Billing</span></a>
411+
<span class="en">Testing In-app Billing</span></a>
412412
</li>
413413
<li><a href="/google/play/billing/billing_admin.html">
414414
<span class="en">Administering In-app Billing</span></a>
415415
</li>
416416
<li><a href="/google/play/billing/billing_reference.html">
417-
<span class="en">In-app Billing Reference</span></a>
417+
<span class="en">Reference</span></a>
418418
</li>
419419
</ul>
420420
</li>
@@ -1267,7 +1267,7 @@ <h4 class="jd-details-title">
12671267
</div>
12681268
<div id="build_info">
12691269

1270-
Android &nbsp;r - 30 Nov 2012 16:06
1270+
Android &nbsp;r &mdash; 02 Dec 2012 17:05
12711271

12721272
</div>
12731273

0 commit comments

Comments
 (0)