diff options
| author | kmccormick <kmccormick@google.com> | 2013-06-05 18:25:12 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-05 18:25:12 -0700 |
| commit | 68291f33e03be5180dc5c921d71cafbc83507301 (patch) | |
| tree | ea06bec7957a60088c79c1a852fba78c984b0f15 /docs/html/reference | |
| parent | f4b21585304781c61d00fa6a14a85fae60f6a50d (diff) | |
| parent | db3158ead35f28ea31a7b6d87c50108cf972a9c0 (diff) | |
| download | frameworks_base-68291f33e03be5180dc5c921d71cafbc83507301.zip frameworks_base-68291f33e03be5180dc5c921d71cafbc83507301.tar.gz frameworks_base-68291f33e03be5180dc5c921d71cafbc83507301.tar.bz2 | |
am db3158ea: Merge "Doc update: Refactoring to client/server." into jb-mr1.1-docs
* commit 'db3158ead35f28ea31a7b6d87c50108cf972a9c0':
Doc update: Refactoring to client/server.
Diffstat (limited to 'docs/html/reference')
6 files changed, 20 insertions, 8 deletions
diff --git a/docs/html/reference/com/google/android/gcm/GCMBaseIntentService.html b/docs/html/reference/com/google/android/gcm/GCMBaseIntentService.html index b230b88..ad50a35 100644 --- a/docs/html/reference/com/google/android/gcm/GCMBaseIntentService.html +++ b/docs/html/reference/com/google/android/gcm/GCMBaseIntentService.html @@ -838,6 +838,9 @@ Summary: <h2>Class Overview</h2> +<div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;"><strong>DEPRECATED.</strong> Please use the <a href= +"http://developer.android.com/reference/com/google/android/gms/gcm/GoogleCloudMessaging.html"><code>GoogleCloudMessaging</code></a> API instead.</div> + <p itemprop="articleBody">Skeleton for application-specific <code><a href="/reference/android/app/IntentService.html">IntentService</a></code>s responsible for handling communication from Google Cloud Messaging service. <p> diff --git a/docs/html/reference/com/google/android/gcm/GCMBroadcastReceiver.html b/docs/html/reference/com/google/android/gcm/GCMBroadcastReceiver.html index 91c0994..ea36df4 100644 --- a/docs/html/reference/com/google/android/gcm/GCMBroadcastReceiver.html +++ b/docs/html/reference/com/google/android/gcm/GCMBroadcastReceiver.html @@ -737,6 +737,10 @@ Summary: <h2>Class Overview</h2> + +<div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;"><strong>DEPRECATED.</strong> Please use the <a href= +"http://developer.android.com/reference/com/google/android/gms/gcm/GoogleCloudMessaging.html"><code>GoogleCloudMessaging</code></a> API instead.</div> + <p itemprop="articleBody"><code><a href="/reference/android/content/BroadcastReceiver.html">BroadcastReceiver</a></code> that receives GCM messages and delivers them to an application-specific <code><a href="/reference/com/google/android/gcm/GCMBaseIntentService.html">GCMBaseIntentService</a></code> subclass. <p> diff --git a/docs/html/reference/com/google/android/gcm/GCMConstants.html b/docs/html/reference/com/google/android/gcm/GCMConstants.html index cb260e0..8b782b6 100644 --- a/docs/html/reference/com/google/android/gcm/GCMConstants.html +++ b/docs/html/reference/com/google/android/gcm/GCMConstants.html @@ -710,6 +710,8 @@ Summary: <h2>Class Overview</h2> +<div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;"><strong>DEPRECATED.</strong> Please use the <a href= +"http://developer.android.com/reference/com/google/android/gms/gcm/GoogleCloudMessaging.html"><code>GoogleCloudMessaging</code></a> API instead.</div> <p itemprop="articleBody">Constants used by the GCM library. </p> diff --git a/docs/html/reference/com/google/android/gcm/GCMRegistrar.html b/docs/html/reference/com/google/android/gcm/GCMRegistrar.html index 545abe2..21a990f 100644 --- a/docs/html/reference/com/google/android/gcm/GCMRegistrar.html +++ b/docs/html/reference/com/google/android/gcm/GCMRegistrar.html @@ -713,6 +713,10 @@ Summary: <h2>Class Overview</h2> + +<div style="background-color:#fffdeb;width:100%;margin-bottom:1em;padding:.5em;"><strong>DEPRECATED.</strong> Please use the <a href= +"http://developer.android.com/reference/com/google/android/gms/gcm/GoogleCloudMessaging.html"><code>GoogleCloudMessaging</code></a> API instead.</div> + <p itemprop="articleBody">Utilities for device registration. <p> <strong>Note:</strong> this class uses a private <code><a href="/reference/android/content/SharedPreferences.html">SharedPreferences</a></code> diff --git a/docs/html/reference/com/google/android/gcm/package-summary.html b/docs/html/reference/com/google/android/gcm/package-summary.html index d2b05e6..6c8a993 100644 --- a/docs/html/reference/com/google/android/gcm/package-summary.html +++ b/docs/html/reference/com/google/android/gcm/package-summary.html @@ -642,21 +642,19 @@ onkeyup="return search_changed(event, false, '/')" /> <table class="jd-sumtable-expando"> <tr class="alt-color api apilevel-" > <td class="jd-linkcol"><a href="/reference/com/google/android/gcm/GCMBaseIntentService.html">GCMBaseIntentService</a></td> - <td class="jd-descrcol" width="100%">Skeleton for application-specific <code><a href="/reference/android/app/IntentService.html">IntentService</a></code>s responsible for - handling communication from Google Cloud Messaging service. </td> + <td class="jd-descrcol" width="100%">DEPRECATED. </td> </tr> <tr class=" api apilevel-" > <td class="jd-linkcol"><a href="/reference/com/google/android/gcm/GCMBroadcastReceiver.html">GCMBroadcastReceiver</a></td> - <td class="jd-descrcol" width="100%"><code><a href="/reference/android/content/BroadcastReceiver.html">BroadcastReceiver</a></code> that receives GCM messages and delivers them to - an application-specific <code><a href="/reference/com/google/android/gcm/GCMBaseIntentService.html">GCMBaseIntentService</a></code> subclass. </td> + <td class="jd-descrcol" width="100%">DEPRECATED. </td> </tr> <tr class="alt-color api apilevel-" > <td class="jd-linkcol"><a href="/reference/com/google/android/gcm/GCMConstants.html">GCMConstants</a></td> - <td class="jd-descrcol" width="100%">Constants used by the GCM library. </td> + <td class="jd-descrcol" width="100%">DEPRECATED. </td> </tr> <tr class=" api apilevel-" > <td class="jd-linkcol"><a href="/reference/com/google/android/gcm/GCMRegistrar.html">GCMRegistrar</a></td> - <td class="jd-descrcol" width="100%">Utilities for device registration. </td> + <td class="jd-descrcol" width="100%">DEPRECATED. </td> </tr> </table> </div> diff --git a/docs/html/reference/gcm-packages.html b/docs/html/reference/gcm-packages.html index 8065be9..2b5dc2d 100644 --- a/docs/html/reference/gcm-packages.html +++ b/docs/html/reference/gcm-packages.html @@ -623,14 +623,15 @@ onkeyup="return search_changed(event, false, '/')" /> <tr class="alt-color api apilevel-" > <td class="jd-linkcol"> <a href="/reference/com/google/android/gcm/package-summary.html">com.google.android.gcm</a></td> - <td class="jd-descrcol" width="100%"></td> + <td class="jd-descrcol" width="100%"><strong>DEPRECATED.</strong> Please use the <a href= +"http://developer.android.com/reference/com/google/android/gms/gcm/GoogleCloudMessaging.html"><code>GoogleCloudMessaging</code></a> API instead of this client helper library. See <a href="http://developer.android.com/google/gcm/client.html">GCM Client</a> for more information.</td> </tr> <tr class=" api apilevel-" > <td class="jd-linkcol"> <a href="/reference/com/google/android/gcm/server/package-summary.html">com.google.android.gcm.server</a></td> - <td class="jd-descrcol" width="100%"></td> + <td class="jd-descrcol" width="100%">Helper library for GCM HTTP server operations. See <a href="http://developer.android.com/google/gcm/server.html">GCM Server</a> for more information.</td> </tr> |