diff options
| author | kmccormick <kmccormick@google.com> | 2013-06-12 19:35:56 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-06-12 19:35:56 -0700 |
| commit | 4b5a6255e096b20513468cc1f55f3038c4c53327 (patch) | |
| tree | 1d407de32823cd3cc6531e8a9ff26cadf17fab7f /docs | |
| parent | fa42499bd51cb07e54c90d21ce80e4d6a8c04e41 (diff) | |
| parent | e9abc5e935deab1c63f89971380b9f9a9eed1af9 (diff) | |
| download | frameworks_base-4b5a6255e096b20513468cc1f55f3038c4c53327.zip frameworks_base-4b5a6255e096b20513468cc1f55f3038c4c53327.tar.gz frameworks_base-4b5a6255e096b20513468cc1f55f3038c4c53327.tar.bz2 | |
am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages
* commit 'e9abc5e935deab1c63f89971380b9f9a9eed1af9':
Doc update: restoring deprecation messages
Diffstat (limited to 'docs')
6 files changed, 21 insertions, 11 deletions
diff --git a/docs/html/reference/com/google/android/gcm/GCMBaseIntentService.html b/docs/html/reference/com/google/android/gcm/GCMBaseIntentService.html index c9c2da4..fba48d4 100644 --- a/docs/html/reference/com/google/android/gcm/GCMBaseIntentService.html +++ b/docs/html/reference/com/google/android/gcm/GCMBaseIntentService.html @@ -850,6 +850,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">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 484bf09..e75f046 100644 --- a/docs/html/reference/com/google/android/gcm/GCMBroadcastReceiver.html +++ b/docs/html/reference/com/google/android/gcm/GCMBroadcastReceiver.html @@ -749,6 +749,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"><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 77f8cfb..0c9d6cd 100644 --- a/docs/html/reference/com/google/android/gcm/GCMConstants.html +++ b/docs/html/reference/com/google/android/gcm/GCMConstants.html @@ -722,6 +722,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 68624ab..643260e 100644 --- a/docs/html/reference/com/google/android/gcm/GCMRegistrar.html +++ b/docs/html/reference/com/google/android/gcm/GCMRegistrar.html @@ -725,6 +725,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">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 db2ea00..7ddea71 100644 --- a/docs/html/reference/com/google/android/gcm/package-summary.html +++ b/docs/html/reference/com/google/android/gcm/package-summary.html @@ -651,24 +651,22 @@ onkeyup="return search_changed(event, false, '/')" /> <h2>Classes</h2> <div class="jd-sumtable"> - <table class="jd-sumtable-expando"> + <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 fb9b7b9..a29e371 100644 --- a/docs/html/reference/gcm-packages.html +++ b/docs/html/reference/gcm-packages.html @@ -632,20 +632,22 @@ onkeyup="return search_changed(event, false, '/')" /> <table class="jd-sumtable"> - <tr class="alt-color api apilevel-" > + <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-" > + <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> + </table> <div id="footer" class="wrap" > |