Skip to content

Commit 037b794

Browse files
Robert LyAndroid (Google) Code Review
authored andcommitted
Merge "docs: update javadocs with gcm @value stuff" into jb-mr1-dev
2 parents 23b4e5b + 672b3ad commit 037b794

File tree

91 files changed

+2784
-3083
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+2784
-3083
lines changed

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

Lines changed: 282 additions & 284 deletions
Large diffs are not rendered by default.

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ <h2 id="searchTitle">Results</h2>
376376
</li>
377377

378378
<li><a href="/google/play-services/maps.html">
379-
<span class="en">Maps</span></a>
379+
<span class="en">Google Maps</span></a>
380380
</li>
381381

382382
<li id="gms-tree-list" class="nav-section">
@@ -392,7 +392,7 @@ <h2 id="searchTitle">Results</h2>
392392

393393
<li class="nav-section">
394394
<div class="nav-section-header"><a href="/google/play/billing/index.html">
395-
<span class="en">Google Play <br />In-app Billing</span></a>
395+
<span class="en">Google Play In-app Billing</span></a>
396396
</div>
397397
<ul>
398398
<li><a href="/google/play/billing/billing_overview.html">
@@ -421,7 +421,7 @@ <h2 id="searchTitle">Results</h2>
421421

422422
<li class="nav-section">
423423
<div class="nav-section-header"><a href="/google/play/dist.html">
424-
<span class="en">Google Play Distribution and Licensing</span></a>
424+
<span class="en">Google Play Distribution</span></a>
425425
</div>
426426
<ul>
427427
<li><a href="/google/play/filters.html">
@@ -599,7 +599,7 @@ <h1 itemprop="name">GCMBroadcastReceiver</h1>
599599

600600

601601

602-
extends <a href="http://developer.android.com/reference/android/content/BroadcastReceiver.html">BroadcastReceiver</a><br/>
602+
extends BroadcastReceiver<br/>
603603

604604

605605

@@ -619,15 +619,15 @@ <h1 itemprop="name">GCMBroadcastReceiver</h1>
619619

620620
<tr>
621621

622-
<td colspan="3" class="jd-inheritance-class-cell"><a href="http://developer.android.com/reference/java/lang/Object.html">java.lang.Object</a></td>
622+
<td colspan="3" class="jd-inheritance-class-cell">java.lang.Object</td>
623623
</tr>
624624

625625

626626
<tr>
627627

628628
<td class="jd-inheritance-space">&nbsp;&nbsp;&nbsp;&#x21b3;</td>
629629

630-
<td colspan="2" class="jd-inheritance-class-cell"><a href="http://developer.android.com/reference/android/content/BroadcastReceiver.html">android.content.BroadcastReceiver</a></td>
630+
<td colspan="2" class="jd-inheritance-class-cell">android.content.BroadcastReceiver</td>
631631
</tr>
632632

633633

@@ -653,7 +653,7 @@ <h1 itemprop="name">GCMBroadcastReceiver</h1>
653653

654654

655655
<h2>Class Overview</h2>
656-
<p itemprop="articleBody"><code><a href="/http://developer.android.com/reference/android/content/BroadcastReceiver.html">BroadcastReceiver</a></code> that receives GCM messages and delivers them to
656+
<p itemprop="articleBody"><code><a href="/reference/android/content/BroadcastReceiver.html">BroadcastReceiver</a></code> that receives GCM messages and delivers them to
657657
an application-specific <code><a href="/reference/com/google/android/gcm/GCMBaseIntentService.html">GCMBaseIntentService</a></code> subclass.
658658
<p>
659659
By default, the <code><a href="/reference/com/google/android/gcm/GCMBaseIntentService.html">GCMBaseIntentService</a></code> class belongs to the application
@@ -755,7 +755,7 @@ <h2>Summary</h2>
755755
void</nobr>
756756
</td>
757757
<td class="jd-linkcol" width="100%"><nobr>
758-
<span class="sympad"><a href="/reference/com/google/android/gcm/GCMBroadcastReceiver.html#onReceive(android.content.Context, android.content.Intent)">onReceive</a></span>(<a href="http://developer.android.com/reference/android/content/Context.html">Context</a> context, <a href="http://developer.android.com/reference/android/content/Intent.html">Intent</a> intent)</nobr>
758+
<span class="sympad"><a href="/reference/com/google/android/gcm/GCMBroadcastReceiver.html#onReceive(android.content.Context, android.content.Intent)">onReceive</a></span>(Context context, Intent intent)</nobr>
759759

760760
</td></tr>
761761

@@ -779,10 +779,10 @@ <h2>Summary</h2>
779779

780780

781781

782-
<a href="http://developer.android.com/reference/java/lang/String.html">String</a></nobr>
782+
String</nobr>
783783
</td>
784784
<td class="jd-linkcol" width="100%"><nobr>
785-
<span class="sympad"><a href="/reference/com/google/android/gcm/GCMBroadcastReceiver.html#getGCMIntentServiceClassName(android.content.Context)">getGCMIntentServiceClassName</a></span>(<a href="http://developer.android.com/reference/android/content/Context.html">Context</a> context)</nobr>
785+
<span class="sympad"><a href="/reference/com/google/android/gcm/GCMBroadcastReceiver.html#getGCMIntentServiceClassName(android.content.Context)">getGCMIntentServiceClassName</a></span>(Context context)</nobr>
786786

787787
<div class="jd-descrdiv">Gets the class name of the intent service that will handle GCM messages.</div>
788788

@@ -810,7 +810,7 @@ <h2>Summary</h2>
810810
class="jd-expando-trigger-img" /></a>
811811
From class
812812

813-
<a href="http://developer.android.com/reference/android/content/BroadcastReceiver.html">android.content.BroadcastReceiver</a>
813+
android.content.BroadcastReceiver
814814

815815
<div id="inherited-methods-android.content.BroadcastReceiver">
816816
<div id="inherited-methods-android.content.BroadcastReceiver-list"
@@ -909,7 +909,7 @@ <h2>Summary</h2>
909909
final
910910

911911

912-
<a href="http://developer.android.com/reference/java/lang/String.html">String</a></nobr>
912+
String</nobr>
913913
</td>
914914
<td class="jd-linkcol" width="100%"><nobr>
915915
<span class="sympad">getResultData</span>()</nobr>
@@ -925,7 +925,7 @@ <h2>Summary</h2>
925925
final
926926

927927

928-
<a href="http://developer.android.com/reference/android/os/Bundle.html">Bundle</a></nobr>
928+
Bundle</nobr>
929929
</td>
930930
<td class="jd-linkcol" width="100%"><nobr>
931931
<span class="sympad">getResultExtras</span>(boolean arg0)</nobr>
@@ -992,7 +992,7 @@ <h2>Summary</h2>
992992
void</nobr>
993993
</td>
994994
<td class="jd-linkcol" width="100%"><nobr>
995-
<span class="sympad">onReceive</span>(<a href="http://developer.android.com/reference/android/content/Context.html">Context</a> arg0, <a href="http://developer.android.com/reference/android/content/Intent.html">Intent</a> arg1)</nobr>
995+
<span class="sympad">onReceive</span>(Context arg0, Intent arg1)</nobr>
996996

997997
</td></tr>
998998

@@ -1005,10 +1005,10 @@ <h2>Summary</h2>
10051005

10061006

10071007

1008-
<a href="http://developer.android.com/reference/android/os/IBinder.html">IBinder</a></nobr>
1008+
IBinder</nobr>
10091009
</td>
10101010
<td class="jd-linkcol" width="100%"><nobr>
1011-
<span class="sympad">peekService</span>(<a href="http://developer.android.com/reference/android/content/Context.html">Context</a> arg0, <a href="http://developer.android.com/reference/android/content/Intent.html">Intent</a> arg1)</nobr>
1011+
<span class="sympad">peekService</span>(Context arg0, Intent arg1)</nobr>
10121012

10131013
</td></tr>
10141014

@@ -1056,7 +1056,7 @@ <h2>Summary</h2>
10561056
void</nobr>
10571057
</td>
10581058
<td class="jd-linkcol" width="100%"><nobr>
1059-
<span class="sympad">setResult</span>(int arg0, <a href="http://developer.android.com/reference/java/lang/String.html">String</a> arg1, <a href="http://developer.android.com/reference/android/os/Bundle.html">Bundle</a> arg2)</nobr>
1059+
<span class="sympad">setResult</span>(int arg0, String arg1, Bundle arg2)</nobr>
10601060

10611061
</td></tr>
10621062

@@ -1088,7 +1088,7 @@ <h2>Summary</h2>
10881088
void</nobr>
10891089
</td>
10901090
<td class="jd-linkcol" width="100%"><nobr>
1091-
<span class="sympad">setResultData</span>(<a href="http://developer.android.com/reference/java/lang/String.html">String</a> arg0)</nobr>
1091+
<span class="sympad">setResultData</span>(String arg0)</nobr>
10921092

10931093
</td></tr>
10941094

@@ -1104,7 +1104,7 @@ <h2>Summary</h2>
11041104
void</nobr>
11051105
</td>
11061106
<td class="jd-linkcol" width="100%"><nobr>
1107-
<span class="sympad">setResultExtras</span>(<a href="http://developer.android.com/reference/android/os/Bundle.html">Bundle</a> arg0)</nobr>
1107+
<span class="sympad">setResultExtras</span>(Bundle arg0)</nobr>
11081108

11091109
</td></tr>
11101110

@@ -1124,7 +1124,7 @@ <h2>Summary</h2>
11241124
class="jd-expando-trigger-img" /></a>
11251125
From class
11261126

1127-
<a href="http://developer.android.com/reference/java/lang/Object.html">java.lang.Object</a>
1127+
java.lang.Object
11281128

11291129
<div id="inherited-methods-java.lang.Object">
11301130
<div id="inherited-methods-java.lang.Object-list"
@@ -1143,7 +1143,7 @@ <h2>Summary</h2>
11431143

11441144

11451145

1146-
<a href="http://developer.android.com/reference/java/lang/Object.html">Object</a></nobr>
1146+
Object</nobr>
11471147
</td>
11481148
<td class="jd-linkcol" width="100%"><nobr>
11491149
<span class="sympad">clone</span>()</nobr>
@@ -1162,7 +1162,7 @@ <h2>Summary</h2>
11621162
boolean</nobr>
11631163
</td>
11641164
<td class="jd-linkcol" width="100%"><nobr>
1165-
<span class="sympad">equals</span>(<a href="http://developer.android.com/reference/java/lang/Object.html">Object</a> arg0)</nobr>
1165+
<span class="sympad">equals</span>(Object arg0)</nobr>
11661166

11671167
</td></tr>
11681168

@@ -1191,7 +1191,7 @@ <h2>Summary</h2>
11911191
final
11921192

11931193

1194-
<a href="http://developer.android.com/reference/java/lang/Class.html">Class</a>&lt;?&gt;</nobr>
1194+
Class&lt;?&gt;</nobr>
11951195
</td>
11961196
<td class="jd-linkcol" width="100%"><nobr>
11971197
<span class="sympad">getClass</span>()</nobr>
@@ -1255,7 +1255,7 @@ <h2>Summary</h2>
12551255

12561256

12571257

1258-
<a href="http://developer.android.com/reference/java/lang/String.html">String</a></nobr>
1258+
String</nobr>
12591259
</td>
12601260
<td class="jd-linkcol" width="100%"><nobr>
12611261
<span class="sympad">toString</span>()</nobr>
@@ -1408,7 +1408,7 @@ <h4 class="jd-details-title">
14081408
void
14091409
</span>
14101410
<span class="sympad">onReceive</span>
1411-
<span class="normal">(<a href="http://developer.android.com/reference/android/content/Context.html">Context</a> context, <a href="http://developer.android.com/reference/android/content/Intent.html">Intent</a> intent)</span>
1411+
<span class="normal">(Context context, Intent intent)</span>
14121412
</h4>
14131413
<div class="api-level">
14141414
<div></div>
@@ -1443,10 +1443,10 @@ <h4 class="jd-details-title">
14431443

14441444

14451445

1446-
<a href="http://developer.android.com/reference/java/lang/String.html">String</a>
1446+
String
14471447
</span>
14481448
<span class="sympad">getGCMIntentServiceClassName</span>
1449-
<span class="normal">(<a href="http://developer.android.com/reference/android/content/Context.html">Context</a> context)</span>
1449+
<span class="normal">(Context context)</span>
14501450
</h4>
14511451
<div class="api-level">
14521452
<div></div>
@@ -1481,7 +1481,7 @@ <h4 class="jd-details-title">
14811481
</div>
14821482
<div id="build_info">
14831483

1484-
Android &nbsp;r - 30 Nov 2012 3:23
1484+
Android &nbsp;r - 30 Nov 2012 16:06
14851485

14861486
</div>
14871487

0 commit comments

Comments
 (0)