diff options
| author | Katie McCormick <kmccormick@google.com> | 2014-02-08 18:44:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-08 18:44:52 +0000 |
| commit | ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3 (patch) | |
| tree | 6002a3f906f420fb97b04ffd076aba881da94e91 | |
| parent | 91bdc7d4bed9e98db0a8d079a993cf90538e2a66 (diff) | |
| parent | 6366dcbd494afe20912a932bb18faf199e4a1c62 (diff) | |
| download | frameworks_base-ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3.zip frameworks_base-ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3.tar.gz frameworks_base-ffc641dd5468878a4d12a8f323bb5b5c75cc9ef3.tar.bz2 | |
am 6366dcbd: am bcc27903: am 44085b68: am f2fcbff8: Merge "Doc update: misc GCM fixes" into klp-docs
* commit '6366dcbd494afe20912a932bb18faf199e4a1c62':
Doc update: misc GCM fixes
| -rw-r--r-- | docs/html/google/gcm/client.jd | 2 | ||||
| -rw-r--r-- | docs/html/google/gcm/gs.jd | 13 | ||||
| -rw-r--r-- | docs/html/google/gcm/server.jd | 1 |
3 files changed, 5 insertions, 11 deletions
diff --git a/docs/html/google/gcm/client.jd b/docs/html/google/gcm/client.jd index ee764ef..42cebfc 100644 --- a/docs/html/google/gcm/client.jd +++ b/docs/html/google/gcm/client.jd @@ -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> <pre>dependencies { - compile: "com.google.android.gms:play-services:3.1.+" + compile "com.google.android.gms:play-services:3.1.+" } </pre> diff --git a/docs/html/google/gcm/gs.jd b/docs/html/google/gcm/gs.jd index 8bc1936..d937955 100644 --- a/docs/html/google/gcm/gs.jd +++ b/docs/html/google/gcm/gs.jd @@ -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>In the <strong>Create a new key</strong> dialog, click <strong>Android key</strong>.</li> - -<li>In the resulting configuration dialog, supply one SHA1 fingerprint and -the package name for your app, separated by a semicolon. For example, -{@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>In the <strong>Create a new key</strong> dialog, click <strong>Server key</strong>.</li> + +<li>In the resulting configuration dialog, supply your server's IP address. For testing +purposes, you can use {@code 0.0.0.0/0}.</p></li> <li>Click <strong>Create</strong>.</li> <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 on a device. See <a href="client.html">Implementing GCM Client</a> for more information.</li> </ol> - diff --git a/docs/html/google/gcm/server.jd b/docs/html/google/gcm/server.jd index 7ba1bd5..ccd1267 100644 --- a/docs/html/google/gcm/server.jd +++ b/docs/html/google/gcm/server.jd @@ -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 API key is included in the header of POST requests that send 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> </ul> |