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

Commit 44085b68 authored by Katie McCormick's avatar Katie McCormick Committed by Android Git Automerger
Browse files

am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs 

* commit 'f2fcbff8':
  Doc update: misc GCM fixes
parents 7fd4d29e f2fcbff8

docs/html/google/gcm/client.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -75,7 +75,7 @@ If you're using Android Studio, this is the string to add to the 
{@code dependency} section of your application's {@code build.gradle} file:</p>

{@code dependency} section of your application's {@code build.gradle} file:</p>





<pre>dependencies {

<pre>dependencies {

   compile: "com.google.android.gms:play-services:3.1.+"

  compile "com.google.android.gms:play-services:3.1.+"

}

}

</pre>

</pre>

docs/html/google/gcm/gs.jd

+4 −9
Original line number Original line Diff line number Diff line
@@ -64,14 +64,10 @@ project number. For example, <strong>Project Number: 670330094152</strong>.</p>< 




 <li>Under <strong>Public API access</strong>, click <strong>Create new key</strong>.</li>

 <li>Under <strong>Public API access</strong>, click <strong>Create new key</strong>.</li>





<li>In the <strong>Create a new key</strong> dialog, click <strong>Android key</strong>.</li>

<li>In the <strong>Create a new key</strong> dialog, click <strong>Server key</strong>.</li>





<li>In the resulting configuration dialog, supply one SHA1 fingerprint and

<li>In the resulting configuration dialog, supply your server's IP address. For testing

the package name for your app, separated by a semicolon. For example,

purposes, you can use {@code 0.0.0.0/0}.</p></li>

{@code 45:B5:E4:6F:36:AD:0A:98:94:B4:02:66:2B:12:17:F2:56:26:A0:E0;com.myexample}.

<p>To get the value for the SHA1 fingerprint, follow the instructions in the

<a href="http://developers.google.com/console/help/new/#installedapplications">console

help</a>.</p></li>

<li>Click <strong>Create</strong>.</li>

<li>Click <strong>Create</strong>.</li>





<li>In the refreshed page, copy the

<li>In the refreshed page, copy the
@@ -102,4 +98,3 @@ Implementing GCM Server</a>.</li> 
<li>Write your client app. This is the GCM-enabled Android application that runs

<li>Write your client app. This is the GCM-enabled Android application that runs

on a device. See <a href="client.html">Implementing GCM Client</a> for more information.</li>

on a device. See <a href="client.html">Implementing GCM Client</a> for more information.</li>

</ol>
 
</ol>

docs/html/google/gcm/server.jd

+0 −1
Original line number Original line Diff line number Diff line
@@ -120,7 +120,6 @@ have an application server that meets the following criteria:</p> 
  <li>Able to store the API key and client registration IDs. The

  <li>Able to store the API key and client registration IDs. The

API key is included in the header of POST requests that send

API key is included in the header of POST requests that send

messages.</li>

messages.</li>

 <li>Able to store the API key and client registration IDs.</li>

 <li>Able to generate message IDs to uniquely identify each message it sends.</li>

 <li>Able to generate message IDs to uniquely identify each message it sends.</li>

</ul>

</ul>