diff options
51 files changed, 327 insertions, 59 deletions
diff --git a/core/java/android/animation/AnimatorSet.java b/core/java/android/animation/AnimatorSet.java index 0b68dd8..c5a4171 100644 --- a/core/java/android/animation/AnimatorSet.java +++ b/core/java/android/animation/AnimatorSet.java @@ -39,6 +39,13 @@ import java.util.List; * result in none of the affected animations being played. Because of this (and because * circular dependencies do not make logical sense anyway), circular dependencies * should be avoided, and the dependency flow of animations should only be in one direction. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about animating with {@code AnimatorSet}, read the + * <a href="{@docRoot}guide/topics/graphics/prop-animation.html#choreography">Property + * Animation</a> developer guide.</p> + * </div> */ public final class AnimatorSet extends Animator { diff --git a/core/java/android/animation/ObjectAnimator.java b/core/java/android/animation/ObjectAnimator.java index d2d66b6..0372cb0 100644 --- a/core/java/android/animation/ObjectAnimator.java +++ b/core/java/android/animation/ObjectAnimator.java @@ -29,6 +29,13 @@ import java.util.ArrayList; * are then determined internally and the animation will call these functions as necessary to * animate the property. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about animating with {@code ObjectAnimator}, read the + * <a href="{@docRoot}guide/topics/graphics/prop-animation.html#object-animator">Property + * Animation</a> developer guide.</p> + * </div> + * * @see #setPropertyName(String) * */ diff --git a/core/java/android/animation/ValueAnimator.java b/core/java/android/animation/ValueAnimator.java index 9bf1634..c7a129e 100755 --- a/core/java/android/animation/ValueAnimator.java +++ b/core/java/android/animation/ValueAnimator.java @@ -39,6 +39,13 @@ import java.util.HashMap; * {@link AccelerateDecelerateInterpolator} class, which accelerates into and decelerates * out of an animation. This behavior can be changed by calling * {@link ValueAnimator#setInterpolator(TimeInterpolator)}.</p> + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about animating with {@code ValueAnimator}, read the + * <a href="{@docRoot}guide/topics/graphics/prop-animation.html#value-animator">Property + * Animation</a> developer guide.</p> + * </div> */ public class ValueAnimator extends Animator { diff --git a/core/java/android/animation/package.html b/core/java/android/animation/package.html index 92eeb20..59178f7 100644 --- a/core/java/android/animation/package.html +++ b/core/java/android/animation/package.html @@ -7,15 +7,15 @@ color values are supported by default. You can animate any other type by telling to calculate the values for that given type with a custom {@link android.animation.TypeEvaluator}. </p> +<p>For more information, see the +<a href="{@docRoot}guide/topics/graphics/animation.html">Animation</a> developer guide.</p> +{@more} + <p> You can set many different types of interpolators (contained in {@link android.view.animation}), specify {@link android.animation.Keyframe keyframes}, or group animations to play sequentially or simultaneously (with {@link android.animation.AnimatorSet}) to further control your animation behaviors.</p> -<p> -For a guide on how to use the property animation system, see the -<a href="{@docRoot}guide/topics/graphics/animation.html">Animation</a> developer guide. -</p> </body> -</html> +</html>
\ No newline at end of file diff --git a/core/java/android/app/SearchManager.java b/core/java/android/app/SearchManager.java index 3aa159e..2ff45fb 100644 --- a/core/java/android/app/SearchManager.java +++ b/core/java/android/app/SearchManager.java @@ -48,10 +48,11 @@ import java.util.List; * {@link android.content.Context#getSystemService * context.getSystemService(Context.SEARCH_SERVICE)}. * - * <div class="special"> - * <p>For a guide to using the search dialog and adding search - * suggestions in your application, see the Dev Guide topic about <strong><a - * href="{@docRoot}guide/topics/search/index.html">Search</a></strong>.</p> + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using the search dialog and adding search + * suggestions in your application, read the + * <a href="{@docRoot}guide/topics/search/index.html">Search</a> developer guide.</p> * </div> */ public class SearchManager diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index 473aec6..43cd330 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -49,6 +49,13 @@ import android.os.Bundle; * A typical file would be:</p> * * {@sample development/samples/ApiDemos/res/xml/device_admin_sample.xml meta_data} + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about device administration, read the + * <a href="{@docRoot}guide/topics/admin/device-admin.html">Device Administration</a> + * developer guide.</p> + * </div> */ public class DeviceAdminReceiver extends BroadcastReceiver { private static String TAG = "DevicePolicy"; diff --git a/core/java/android/app/admin/DevicePolicyManager.java b/core/java/android/app/admin/DevicePolicyManager.java index c89396b..4ed0766 100644 --- a/core/java/android/app/admin/DevicePolicyManager.java +++ b/core/java/android/app/admin/DevicePolicyManager.java @@ -40,6 +40,13 @@ import java.util.List; * Public interface for managing policies enforced on a device. Most clients * of this class must have published a {@link DeviceAdminReceiver} that the user * has currently enabled. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about managing policies for device adminstration, read the + * <a href="{@docRoot}guide/topics/admin/device-admin.html">Device Administration</a> + * developer guide.</p> + * </div> */ public class DevicePolicyManager { private static String TAG = "DevicePolicyManager"; diff --git a/core/java/android/app/admin/package.html b/core/java/android/app/admin/package.html index 1a81083..c363c25 100644 --- a/core/java/android/app/admin/package.html +++ b/core/java/android/app/admin/package.html @@ -4,8 +4,9 @@ security-aware applications that are useful in enterprise settings, in which IT professionals require rich control over employee devices.</p> -<p>For more information, see the <a -href="{@docRoot}guide/topics/admin/device-admin.html">Device Administration</a> developer guide.</p> +<p>For more information, see the +<a href="{@docRoot}guide/topics/admin/device-admin.html">Device Administration</a> +developer guide.</p> {@more} </BODY> diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java index 09661a5..a7f7792 100644 --- a/core/java/android/appwidget/AppWidgetManager.java +++ b/core/java/android/appwidget/AppWidgetManager.java @@ -35,6 +35,12 @@ import java.util.WeakHashMap; /** * Updates AppWidget state; gets information about installed AppWidget providers and other * AppWidget related state. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about creating app widgets, read the + * <a href="{@docRoot}guide/topics/appwidgets/index.html">App Widgets</a> developer guide.</p> + * </div> */ public class AppWidgetManager { static final String TAG = "AppWidgetManager"; diff --git a/core/java/android/appwidget/AppWidgetProvider.java b/core/java/android/appwidget/AppWidgetProvider.java index f1bbede..00a5f0c 100755 --- a/core/java/android/appwidget/AppWidgetProvider.java +++ b/core/java/android/appwidget/AppWidgetProvider.java @@ -31,8 +31,13 @@ import android.os.Bundle; * <p>Extend this class and override one or more of the {@link #onUpdate}, {@link #onDeleted}, * {@link #onEnabled} or {@link #onDisabled} methods to implement your own AppWidget functionality. * </p> - * <p>For an example of how to write a AppWidget provider, see the - * <a href="{@docRoot}guide/topics/appwidgets/index.html#Providers">AppWidgets</a> documentation.</p> + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about how to write an app widget provider, read the + * <a href="{@docRoot}guide/topics/appwidgets/index.html#AppWidgetProvider">App Widgets</a> + * developer guide.</p> + * </div> */ public class AppWidgetProvider extends BroadcastReceiver { /** diff --git a/core/java/android/appwidget/package.html b/core/java/android/appwidget/package.html index 19fd2f7..aa72da2 100644 --- a/core/java/android/appwidget/package.html +++ b/core/java/android/appwidget/package.html @@ -2,11 +2,11 @@ <p>Contains the components necessary to create "app widgets", which users can embed in other applications (such as the home screen) to quickly access application data and services without launching a new activity.</p> -<p>For more information, see the -<a href="{@docRoot}guide/topics/appwidgets/index.html">App Widgets</a> -developer guide.</p> +<p>For more information, see the +<a href="{@docRoot}guide/topics/appwidgets/index.html">App Widgets</a> developer guide.</p> {@more} + <p>The behavior of an app widget is published by an "app widget provider." An "app widget host" is a component that can contain app widgets (such as the Home screen).</p> @@ -24,9 +24,8 @@ details are left up to the widget hosts. For example, the home screen has one w widgets, but the lock screen could also contain widgets, and it would have a different way of adding, removing and otherwise managing widgets.</p> -<p>The <a href="{@docRoot}guide/topics/appwidgets/index.html">App Widgets</a> -developer guide shows you how to create an app widget provider. For information about implementing -an app widget host, see the {@link android.appwidget.AppWidgetHost} class.</p> +<p>For information about implementing an app widget host, see the {@link +android.appwidget.AppWidgetHost} class.</p> </body> diff --git a/core/java/android/bluetooth/BluetoothAdapter.java b/core/java/android/bluetooth/BluetoothAdapter.java index e420bfd..600ce6f 100644 --- a/core/java/android/bluetooth/BluetoothAdapter.java +++ b/core/java/android/bluetooth/BluetoothAdapter.java @@ -62,6 +62,12 @@ import java.util.UUID; * permission and some also require the * {@link android.Manifest.permission#BLUETOOTH_ADMIN} permission. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using Bluetooth, read the + * <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> + * </div> + * * {@see BluetoothDevice} * {@see BluetoothServerSocket} */ diff --git a/core/java/android/bluetooth/BluetoothDevice.java b/core/java/android/bluetooth/BluetoothDevice.java index 0306521..189e8fc 100644 --- a/core/java/android/bluetooth/BluetoothDevice.java +++ b/core/java/android/bluetooth/BluetoothDevice.java @@ -54,6 +54,12 @@ import java.util.UUID; * <p class="note"><strong>Note:</strong> * Requires the {@link android.Manifest.permission#BLUETOOTH} permission. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using Bluetooth, read the + * <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> + * </div> + * * {@see BluetoothAdapter} * {@see BluetoothSocket} */ diff --git a/core/java/android/bluetooth/BluetoothServerSocket.java b/core/java/android/bluetooth/BluetoothServerSocket.java index acce182..4021f7b 100644 --- a/core/java/android/bluetooth/BluetoothServerSocket.java +++ b/core/java/android/bluetooth/BluetoothServerSocket.java @@ -55,6 +55,12 @@ import java.io.IOException; * <p class="note"><strong>Note:</strong> * Requires the {@link android.Manifest.permission#BLUETOOTH} permission. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using Bluetooth, read the + * <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> + * </div> + * * {@see BluetoothSocket} */ public final class BluetoothServerSocket implements Closeable { diff --git a/core/java/android/bluetooth/BluetoothSocket.java b/core/java/android/bluetooth/BluetoothSocket.java index 9a13c3e..19d13ef 100644 --- a/core/java/android/bluetooth/BluetoothSocket.java +++ b/core/java/android/bluetooth/BluetoothSocket.java @@ -65,6 +65,12 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; * <p class="note"><strong>Note:</strong> * Requires the {@link android.Manifest.permission#BLUETOOTH} permission. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using Bluetooth, read the + * <a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> + * </div> + * * {@see BluetoothServerSocket} * {@see java.io.InputStream} * {@see java.io.OutputStream} diff --git a/core/java/android/bluetooth/package.html b/core/java/android/bluetooth/package.html index 37505fd..81bf1cf 100644 --- a/core/java/android/bluetooth/package.html +++ b/core/java/android/bluetooth/package.html @@ -3,8 +3,8 @@ <p>Provides classes that manage Bluetooth functionality, such as scanning for devices, connecting with devices, and managing data transfer between devices.</p> -<p>For more information, see the <a -href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> +<p>For more information, see the +<a href="{@docRoot}guide/topics/wireless/bluetooth.html">Bluetooth</a> developer guide.</p> {@more} <p>The Bluetooth APIs let applications:</p> @@ -26,5 +26,6 @@ permission. <p class="note"><strong>Note:</strong> Not all Android-powered devices provide Bluetooth functionality.</p> + </BODY> </HTML> diff --git a/core/java/android/content/ClipData.java b/core/java/android/content/ClipData.java index d9c6b07..a8b1bf4 100644 --- a/core/java/android/content/ClipData.java +++ b/core/java/android/content/ClipData.java @@ -50,6 +50,13 @@ import java.util.ArrayList; * CharSequence of text, a single Intent object, or a Uri. See {@link Item} * for more details. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using the clipboard framework, read the + * <a href="{@docRoot}guide/topics/clipboard/copy-paste.html">Copy and Paste</a> + * developer guide.</p> + * </div> + * * <a name="ImplementingPaste"></a> * <h3>Implementing Paste or Drop</h3> * diff --git a/core/java/android/content/ClipDescription.java b/core/java/android/content/ClipDescription.java index 0d9d807..b5fa20c 100644 --- a/core/java/android/content/ClipDescription.java +++ b/core/java/android/content/ClipDescription.java @@ -26,6 +26,13 @@ import java.util.ArrayList; * Meta-data describing the contents of a {@link ClipData}. Provides enough * information to know if you can handle the ClipData, but not the data * itself. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using the clipboard framework, read the + * <a href="{@docRoot}guide/topics/clipboard/copy-paste.html">Copy and Paste</a> + * developer guide.</p> + * </div> */ public class ClipDescription implements Parcelable { /** diff --git a/core/java/android/content/ClipboardManager.java b/core/java/android/content/ClipboardManager.java index a79f060..800d0d2 100644 --- a/core/java/android/content/ClipboardManager.java +++ b/core/java/android/content/ClipboardManager.java @@ -40,6 +40,13 @@ import java.util.ArrayList; * is expressed as a {@link ClipData} object, which defines the protocol * for data exchange between applications. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using the clipboard framework, read the + * <a href="{@docRoot}guide/topics/clipboard/copy-paste.html">Copy and Paste</a> + * developer guide.</p> + * </div> + * * @see android.content.Context#getSystemService */ public class ClipboardManager extends android.text.ClipboardManager { diff --git a/core/java/android/content/SearchRecentSuggestionsProvider.java b/core/java/android/content/SearchRecentSuggestionsProvider.java index e1a8d21..d6f7d97 100644 --- a/core/java/android/content/SearchRecentSuggestionsProvider.java +++ b/core/java/android/content/SearchRecentSuggestionsProvider.java @@ -61,6 +61,12 @@ import android.util.Log; * for future searches by calling {@link android.provider.SearchRecentSuggestions#saveRecentQuery * SearchRecentSuggestions.saveRecentQuery()}.</li> * </ul> + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For information about using search suggestions in your application, read the + * <a href="{@docRoot}guide/topics/search/index.html">Search</a> developer guide.</p> + * </div> * * @see android.provider.SearchRecentSuggestions */ diff --git a/core/java/android/hardware/usb/UsbAccessory.java b/core/java/android/hardware/usb/UsbAccessory.java index c8ea825..7702044 100644 --- a/core/java/android/hardware/usb/UsbAccessory.java +++ b/core/java/android/hardware/usb/UsbAccessory.java @@ -37,6 +37,12 @@ import android.util.Log; * {@link UsbManager#ACTION_USB_ACCESSORY_ATTACHED} Intent. * The application can then call {@link UsbManager#openAccessory} to open a file descriptor * for reading and writing data to and from the accessory. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about communicating with USB hardware, read the + * <a href="{@docRoot}guide/topics/usb/index.html">USB</a> developer guide.</p> + * </div> */ public class UsbAccessory implements Parcelable { diff --git a/core/java/android/hardware/usb/UsbDevice.java b/core/java/android/hardware/usb/UsbDevice.java index af3f7f0..9bd38f9 100644 --- a/core/java/android/hardware/usb/UsbDevice.java +++ b/core/java/android/hardware/usb/UsbDevice.java @@ -34,6 +34,12 @@ import java.io.FileDescriptor; * To communicate with the device, you open a {@link UsbDeviceConnection} for the device * and use {@link UsbRequest} to send and receive data on an endpoint. * {@link UsbDeviceConnection#controlTransfer} is used for control requests on endpoint zero. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about communicating with USB hardware, read the + * <a href="{@docRoot}guide/topics/usb/index.html">USB</a> developer guide.</p> + * </div> */ public class UsbDevice implements Parcelable { diff --git a/core/java/android/hardware/usb/UsbInterface.java b/core/java/android/hardware/usb/UsbInterface.java index 3b51063..d6c54a8 100644 --- a/core/java/android/hardware/usb/UsbInterface.java +++ b/core/java/android/hardware/usb/UsbInterface.java @@ -26,6 +26,12 @@ import android.os.Parcelable; * piece of functionality, separate from the other interfaces. * An interface will have one or more {@link UsbEndpoint}s, which are the * channels by which the host transfers data with the device. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about communicating with USB hardware, read the + * <a href="{@docRoot}guide/topics/usb/index.html">USB</a> developer guide.</p> + * </div> */ public class UsbInterface implements Parcelable { diff --git a/core/java/android/hardware/usb/UsbManager.java b/core/java/android/hardware/usb/UsbManager.java index 551926c..93f93c7 100644 --- a/core/java/android/hardware/usb/UsbManager.java +++ b/core/java/android/hardware/usb/UsbManager.java @@ -35,8 +35,13 @@ import java.util.HashMap; * {@link android.content.Context#getSystemService(java.lang.String) Context.getSystemService()}. * * {@samplecode - * UsbManager manager = (UsbManager) getSystemService(Context.USB_SERVICE); - * } + * UsbManager manager = (UsbManager) getSystemService(Context.USB_SERVICE);} + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about communicating with USB hardware, read the + * <a href="{@docRoot}guide/topics/usb/index.html">USB</a> developer guide.</p> + * </div> */ public class UsbManager { private static final String TAG = "UsbManager"; diff --git a/core/java/android/hardware/usb/package.html b/core/java/android/hardware/usb/package.html index 5fd5a30..b32e0df 100644 --- a/core/java/android/hardware/usb/package.html +++ b/core/java/android/hardware/usb/package.html @@ -1,9 +1,16 @@ <HTML> <BODY> -<p>Provides support to communicate with USB hardware peripherals that are connected to Android-powered -devices. Use {@link android.hardware.usb.UsbManager} to access the state of the USB and to +<p>Provides support to communicate with USB hardware peripherals that are connected to +Android-powered devices.</p> + +<p>For more information, see the +<a href="{@docRoot}guide/topics/usb/index.html">USB</a> developer guide.</p> +{@more} + +<p>Use {@link android.hardware.usb.UsbManager} to access the state of the USB and to communicate with connected hardware peripherals. Use {@link android.hardware.usb.UsbDevice} to -communicate with the hardware peripheral if the Android-powered device is acting as the USB host. Use -{@link android.hardware.usb.UsbAccessory} if the peripheral is acting as the USB host.</p> +communicate with the hardware peripheral if the Android-powered device is acting as the USB host. +Use {@link android.hardware.usb.UsbAccessory} if the peripheral is acting as the USB host.</p> + </BODY> </HTML>
\ No newline at end of file diff --git a/core/java/android/nfc/NfcAdapter.java b/core/java/android/nfc/NfcAdapter.java index f3c884d..53a0341 100644 --- a/core/java/android/nfc/NfcAdapter.java +++ b/core/java/android/nfc/NfcAdapter.java @@ -42,6 +42,12 @@ import android.util.Log; * <p> * Use the helper {@link #getDefaultAdapter(Context)} to get the default NFC * adapter for this Android device. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using NFC, read the + * <a href="{@docRoot}guide/topics/nfc/index.html">Near Field Communication</a> developer guide.</p> + * </div> */ public final class NfcAdapter { static final String TAG = "NFC"; diff --git a/core/java/android/nfc/NfcManager.java b/core/java/android/nfc/NfcManager.java index 2bbed57..ea08014 100644 --- a/core/java/android/nfc/NfcManager.java +++ b/core/java/android/nfc/NfcManager.java @@ -28,6 +28,12 @@ import android.content.Context; * Alternately, you can just call the static helper * {@link NfcAdapter#getDefaultAdapter(android.content.Context)}. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using NFC, read the + * <a href="{@docRoot}guide/topics/nfc/index.html">Near Field Communication</a> developer guide.</p> + * </div> + * * @see Context#getSystemService * @see NfcAdapter#getDefaultAdapter(android.content.Context) */ diff --git a/core/java/android/nfc/package.html b/core/java/android/nfc/package.html index 97bb29d..9e028a5 100644 --- a/core/java/android/nfc/package.html +++ b/core/java/android/nfc/package.html @@ -1,7 +1,11 @@ <HTML> <BODY> -Provides access to Near Field Communication (NFC) functionality, allowing applications to read -NDEF message in NFC tags. A "tag" may actually be another device that appears as a tag. +<p>Provides access to Near Field Communication (NFC) functionality, allowing applications to read +NDEF message in NFC tags. A "tag" may actually be another device that appears as a tag.</p> + +<p>For more information, see the +<a href="{@docRoot}guide/topics/nfc/index.html">Near Field Communication</a> developer guide.</p> +{@more} <p>Here's a summary of the classes:</p> @@ -24,5 +28,6 @@ type of data being shared and carries the data itself.</dd> <p class="note"><strong>Note:</strong> Not all Android-powered devices provide NFC functionality.</p> + </BODY> </HTML> diff --git a/core/java/android/provider/SearchRecentSuggestions.java b/core/java/android/provider/SearchRecentSuggestions.java index 13ad9d3..c165487 100644 --- a/core/java/android/provider/SearchRecentSuggestions.java +++ b/core/java/android/provider/SearchRecentSuggestions.java @@ -44,6 +44,13 @@ import java.util.concurrent.Semaphore; * * <p>For a working example, see SearchSuggestionSampleProvider and SearchQueryResults in * samples/ApiDemos/app. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For information about using search suggestions in your application, read the + * <a href="{@docRoot}guide/topics/search/adding-recent-query-suggestions.html">Adding Recent Query + * Suggestions</a> developer guide.</p> + * </div> */ public class SearchRecentSuggestions { // debugging support diff --git a/core/java/android/test/package.html b/core/java/android/test/package.html index 1972bed..770e9a5 100644 --- a/core/java/android/test/package.html +++ b/core/java/android/test/package.html @@ -1,5 +1,10 @@ <HTML> <BODY> -A framework for writing Android test cases and suites. +<p>A framework for writing Android test cases and suites.</p> + +<p>For more information, see the +<a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p> +{@more} + </BODY> </HTML>
\ No newline at end of file diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index f524ef0..9d2ff2e 100644 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -75,10 +75,11 @@ import java.util.WeakHashMap; * If you want the search field to always be visible, then call setIconifiedByDefault(false). * </p> * - * <p> - * For more information, see the <a href="{@docRoot}guide/topics/search/index.html">Search</a> - * documentation. - * <p> + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For information about using {@code SearchView}, read the + * <a href="{@docRoot}guide/topics/search/index.html">Search</a> developer guide.</p> + * </div> * * @see android.view.MenuItem#SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW * @attr ref android.R.styleable#SearchView_iconifiedByDefault diff --git a/graphics/java/android/graphics/drawable/AnimationDrawable.java b/graphics/java/android/graphics/drawable/AnimationDrawable.java index f02d0f9..4ad5b9f 100644 --- a/graphics/java/android/graphics/drawable/AnimationDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimationDrawable.java @@ -64,8 +64,13 @@ import android.util.AttributeSet; * // Start the animation (looped playback by default). * frameAnimation.start(); * </pre> - * <p>For more information, see the guide to <a - * href="{@docRoot}guide/topics/resources/animation-resource.html">Animation Resources</a>.</p> + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about animating with {@code AnimationDrawable}, read the + * <a href="{@docRoot}guide/topics/graphics/drawable-animation.html">Drawable Animation</a> + * developer guide.</p> + * </div> * * @attr ref android.R.styleable#AnimationDrawable_visible * @attr ref android.R.styleable#AnimationDrawable_variablePadding diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index 12e5ada..f285f5b 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -62,6 +62,11 @@ import android.util.TypedValue; * The unchecked variants exist to allow apps to copy over arrays of structures from a * control language that does not support structures.</p> * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about creating an application that uses Renderscript, read the + * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * </div> **/ public class Allocation extends BaseObj { Type mType; diff --git a/graphics/java/android/renderscript/Element.java b/graphics/java/android/renderscript/Element.java index 29306e4..22ef7bb 100644 --- a/graphics/java/android/renderscript/Element.java +++ b/graphics/java/android/renderscript/Element.java @@ -40,6 +40,12 @@ import android.util.Log; * <p>The primary source of elements are from scripts. A script that exports a * bind point for a data structure generates a Renderscript element to represent the * data exported by the script. The other common source of elements is from bitmap formats.</p> + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about creating an application that uses Renderscript, read the + * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * </div> **/ public class Element extends BaseObj { int mSize; diff --git a/graphics/java/android/renderscript/RSSurfaceView.java b/graphics/java/android/renderscript/RSSurfaceView.java index a8e3107..6756fd0 100644 --- a/graphics/java/android/renderscript/RSSurfaceView.java +++ b/graphics/java/android/renderscript/RSSurfaceView.java @@ -31,6 +31,12 @@ import android.view.SurfaceView; /** * The Surface View for a graphics renderscript (RenderScriptGL) to draw on. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about creating an application that uses Renderscript, read the + * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * </div> */ public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback { private SurfaceHolder mSurfaceHolder; diff --git a/graphics/java/android/renderscript/RenderScript.java b/graphics/java/android/renderscript/RenderScript.java index 1305633..ad10832 100644 --- a/graphics/java/android/renderscript/RenderScript.java +++ b/graphics/java/android/renderscript/RenderScript.java @@ -32,13 +32,16 @@ import android.view.Surface; /** - * RenderScript base master class. An instance of this class creates native + * Renderscript base master class. An instance of this class creates native * worker threads for processing commands from this object. This base class * does not provide any extended capabilities beyond simple data processing. * For extended capabilities use derived classes such as RenderScriptGL. * - * - * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about creating an application that uses Renderscript, read the + * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * </div> **/ public class RenderScript { static final String LOG_TAG = "RenderScript_jni"; diff --git a/graphics/java/android/renderscript/RenderScriptGL.java b/graphics/java/android/renderscript/RenderScriptGL.java index 2dfcc83..2cfeb17 100644 --- a/graphics/java/android/renderscript/RenderScriptGL.java +++ b/graphics/java/android/renderscript/RenderScriptGL.java @@ -29,11 +29,17 @@ import android.view.SurfaceHolder; import android.view.SurfaceView; /** - * The Graphics derivitive of RenderScript. Extends the basic context to add a + * The Graphics derivitive of Renderscript. Extends the basic context to add a * root script which is the display window for graphical output. When the * system needs to update the display the currently bound root script will be * called. This script is expected to issue the rendering commands to repaint * the screen. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about creating an application that uses Renderscript, read the + * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * </div> **/ public class RenderScriptGL extends RenderScript { int mWidth; diff --git a/graphics/java/android/renderscript/Type.java b/graphics/java/android/renderscript/Type.java index f88af8b..70d1de4 100644 --- a/graphics/java/android/renderscript/Type.java +++ b/graphics/java/android/renderscript/Type.java @@ -35,6 +35,11 @@ import android.util.Log; * * <p>The LOD and Faces dimensions are booleans to indicate present or not present.</p> * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about creating an application that uses Renderscript, read the + * <a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> + * </div> **/ public class Type extends BaseObj { int mDimX; diff --git a/graphics/java/android/renderscript/package.html b/graphics/java/android/renderscript/package.html index 36a24ff..775645f 100644 --- a/graphics/java/android/renderscript/package.html +++ b/graphics/java/android/renderscript/package.html @@ -1,10 +1,16 @@ <HTML> <BODY> <p>The Renderscript rendering and computational APIs offer a low-level, high performance means of -carrying out mathematical calculations and 3D graphics rendering. An example of Renderscript in -applications include the 3D carousel view that is present in Android 3.0 applications such as the -Books and YouTube applications. This API is intended for developers who are comfortable working with -native code and want to maximize their performance critical applications.</p> +carrying out mathematical calculations and 3D graphics rendering.</p> + +<p>For more information, see the +<a href="{@docRoot}guide/topics/graphics/renderscript.html">Renderscript</a> developer guide.</p> +{@more} + +<p>An example of Renderscript in applications include the 3D carousel view that is present in +Android 3.0 applications such as the Books and YouTube applications. This API is intended for +developers who are comfortable working with native code and want to maximize their performance +critical applications.</p> <p>Renderscript adopts a control and slave architecture where the low-level native code is controlled by the higher level Android system that runs in the virtual machine (VM). The VM code handles resource @@ -14,7 +20,7 @@ the native Renderscript code, which you write in C (C99 standard). The Renderscr does the intensive computation and returns the result back to the Android VM.</p> <p>You can find the Renderscript native -APIs in the <code><sdk_root>/platforms/android-3.0/renderscript</code> directory. +APIs in the <code><sdk_root>/platforms/android-11/renderscript</code> directory. The Android system APIs are broken into a few main groups:</p> <h4>Core</h4> @@ -37,7 +43,7 @@ classes include:</p> <li>Byte2, Byte3, and Byte4</li> <li>Float2, Float3, Float4</li> <li>Int2, Int3, Int4</li> - <li>Long2, Long3, Long4</li> + <li>Long2, Long3, Long4</li> <li>Matrix2f, Matrix3f, Matrix4f</li> <li>Short2, Short3, Short4</li> </ul> @@ -76,10 +82,5 @@ pipeline.</p> </ul> </p> -<p> -For information on how to create an application that uses Renderscript, and also the -see <a href="../../../guide/topics/graphics/renderscript.html">3D with -Renderscript</a> dev guide. -</p> </BODY> </HTML> diff --git a/location/java/android/location/LocationListener.java b/location/java/android/location/LocationListener.java index 0f5f388..88904c8 100644 --- a/location/java/android/location/LocationListener.java +++ b/location/java/android/location/LocationListener.java @@ -24,6 +24,13 @@ import android.os.Bundle; * LocationListener has been registered with the location manager service * using the {@link LocationManager#requestLocationUpdates(String, long, float, LocationListener)} * method. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about identifying user location, read the + * <a href="{@docRoot}guide/topics/location/obtaining-user-location.html">Obtaining User + * Location</a> developer guide.</p> + * </div> */ public interface LocationListener { diff --git a/location/java/android/location/LocationManager.java b/location/java/android/location/LocationManager.java index 2817df8..91d8bc1 100644 --- a/location/java/android/location/LocationManager.java +++ b/location/java/android/location/LocationManager.java @@ -42,6 +42,13 @@ import java.util.List; * instantiate this class directly; instead, retrieve it through * {@link android.content.Context#getSystemService * Context.getSystemService(Context.LOCATION_SERVICE)}. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using location services, read the + * <a href="{@docRoot}guide/topics/location/index.html">Location and Maps</a> + * developer guide.</p> + * </div> */ public class LocationManager { private static final String TAG = "LocationManager"; diff --git a/location/java/android/location/package.html b/location/java/android/location/package.html index be34774..1abe098 100644 --- a/location/java/android/location/package.html +++ b/location/java/android/location/package.html @@ -1,10 +1,10 @@ <html> - <body> <p>Contains classes that define Android location-based and related services.</p> -<p>For more information about location services, see the documentation for <a -href="{@docRoot}guide/topics/location/obtaining-user-location.html">Obtaining User Location</a>.</p> + +<p>For more information, see the +<a href="{@docRoot}guide/topics/location/index.html">Location and Maps</a> developer guide.</p> {@more} </body> diff --git a/test-runner/src/android/test/ActivityInstrumentationTestCase2.java b/test-runner/src/android/test/ActivityInstrumentationTestCase2.java index 24b125e..c4bcf31 100644 --- a/test-runner/src/android/test/ActivityInstrumentationTestCase2.java +++ b/test-runner/src/android/test/ActivityInstrumentationTestCase2.java @@ -37,6 +37,12 @@ import java.lang.reflect.Method; * New tests should be written using this base class. * * <p>If you prefer an isolated unit test, see {@link android.test.ActivityUnitTestCase}. + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about application testing, read the + * <a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p> + * </div> */ public abstract class ActivityInstrumentationTestCase2<T extends Activity> extends ActivityTestCase { diff --git a/test-runner/src/android/test/InstrumentationTestRunner.java b/test-runner/src/android/test/InstrumentationTestRunner.java index 70cf89e..43285fb 100644 --- a/test-runner/src/android/test/InstrumentationTestRunner.java +++ b/test-runner/src/android/test/InstrumentationTestRunner.java @@ -54,7 +54,15 @@ import junit.textui.ResultPrinter; /** * An {@link Instrumentation} that runs various types of {@link junit.framework.TestCase}s against - * an Android package (application). Typical usage: + * an Android package (application). + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about application testing, read the + * <a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p> + * </div> + * + * <h3>Typical Usage</h3> * <ol> * <li>Write {@link junit.framework.TestCase}s that perform unit, functional, or performance tests * against the classes in your package. Typically these are subclassed from: diff --git a/test-runner/src/android/test/ServiceTestCase.java b/test-runner/src/android/test/ServiceTestCase.java index 8fad5d6..06c1c5b 100644 --- a/test-runner/src/android/test/ServiceTestCase.java +++ b/test-runner/src/android/test/ServiceTestCase.java @@ -34,6 +34,12 @@ import java.util.Random; * Service, and hooks with which you can inject various dependencies and control * the environment in which your Service is tested. * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about application testing, read the + * <a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p> + * </div> + * * <p><b>Lifecycle Support.</b> * A Service is accessed with a specific sequence of * calls, as described in the diff --git a/test-runner/src/android/test/mock/MockContentResolver.java b/test-runner/src/android/test/mock/MockContentResolver.java index 26eb8e4..6c91f4e 100644 --- a/test-runner/src/android/test/mock/MockContentResolver.java +++ b/test-runner/src/android/test/mock/MockContentResolver.java @@ -43,6 +43,12 @@ import java.util.Map; * Users can also set an authority's entry in the map to null, so that a provider is completely * mocked out. * </p> + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about application testing, read the + * <a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p> + * </div> */ public class MockContentResolver extends ContentResolver { diff --git a/test-runner/src/android/test/mock/package.html b/test-runner/src/android/test/mock/package.html index 0f1bc6f4..29b2d80 100644 --- a/test-runner/src/android/test/mock/package.html +++ b/test-runner/src/android/test/mock/package.html @@ -1,5 +1,10 @@ <HTML> <BODY> -Utility classes providing stubs or mocks of various Android framework building blocks. +<p>Utility classes providing stubs or mocks of various Android framework building blocks.</p> + +<p>For more information, see the +<a href="{@docRoot}guide/topics/testing/index.html">Testing</a> developer guide.</p> +{@more} + </BODY> </HTML> diff --git a/voip/java/android/net/sip/SipAudioCall.java b/voip/java/android/net/sip/SipAudioCall.java index fcdbd2c..1d67055 100644 --- a/voip/java/android/net/sip/SipAudioCall.java +++ b/voip/java/android/net/sip/SipAudioCall.java @@ -44,13 +44,20 @@ import java.util.Map; * * <p class="note"><strong>Note:</strong> Using this class require the * {@link android.Manifest.permission#INTERNET} and - * {@link android.Manifest.permission#USE_SIP} permissions.<br/><br/>In addition, {@link + * {@link android.Manifest.permission#USE_SIP} permissions. In addition, {@link * #startAudio} requires the * {@link android.Manifest.permission#RECORD_AUDIO}, * {@link android.Manifest.permission#ACCESS_WIFI_STATE}, and * {@link android.Manifest.permission#WAKE_LOCK} permissions; and {@link #setSpeakerMode * setSpeakerMode()} requires the * {@link android.Manifest.permission#MODIFY_AUDIO_SETTINGS} permission.</p> + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using SIP, read the + * <a href="{@docRoot}guide/topics/network/sip.html">Session Initiation Protocol</a> + * developer guide.</p> + * </div> */ public class SipAudioCall { private static final String TAG = SipAudioCall.class.getSimpleName(); diff --git a/voip/java/android/net/sip/SipManager.java b/voip/java/android/net/sip/SipManager.java index cd0b5c4..74c3672 100644 --- a/voip/java/android/net/sip/SipManager.java +++ b/voip/java/android/net/sip/SipManager.java @@ -49,9 +49,16 @@ import java.text.ParseException; * SIP. You should always call {@link android.net.sip.SipManager#isVoipSupported * isVoipSupported()} to verify that the device supports VOIP calling and {@link * android.net.sip.SipManager#isApiSupported isApiSupported()} to verify that the device supports - * the SIP APIs.<br/><br/>Your application must also request the {@link + * the SIP APIs. Your application must also request the {@link * android.Manifest.permission#INTERNET} and {@link android.Manifest.permission#USE_SIP} * permissions.</p> + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using SIP, read the + * <a href="{@docRoot}guide/topics/network/sip.html">Session Initiation Protocol</a> + * developer guide.</p> + * </div> */ public class SipManager { /** diff --git a/voip/java/android/net/sip/SipProfile.java b/voip/java/android/net/sip/SipProfile.java index 34d91dd..0ef754c 100644 --- a/voip/java/android/net/sip/SipProfile.java +++ b/voip/java/android/net/sip/SipProfile.java @@ -37,6 +37,13 @@ import javax.sip.address.URI; * <p>You can create a {@link SipProfile} using {@link * SipProfile.Builder}. You can also retrieve one from a {@link SipSession}, using {@link * SipSession#getLocalProfile} and {@link SipSession#getPeerProfile}.</p> + * + * <div class="special reference"> + * <h3>Developer Guides</h3> + * <p>For more information about using SIP, read the + * <a href="{@docRoot}guide/topics/network/sip.html">Session Initiation Protocol</a> + * developer guide.</p> + * </div> */ public class SipProfile implements Parcelable, Serializable, Cloneable { private static final long serialVersionUID = 1L; diff --git a/voip/java/android/net/sip/package.html b/voip/java/android/net/sip/package.html index 790656b..eb683d0 100644 --- a/voip/java/android/net/sip/package.html +++ b/voip/java/android/net/sip/package.html @@ -3,6 +3,11 @@ <p>Provides access to Session Initiation Protocol (SIP) functionality, such as making and answering VOIP calls using SIP.</p> +<p>For more information, see the +<a href="{@docRoot}guide/topics/network/sip.html">Session Initiation Protocol</a> +developer guide.</p> +{@more} + <p>To get started, you need to get an instance of the {@link android.net.sip.SipManager} by calling {@link android.net.sip.SipManager#newInstance newInstance()}.</p> @@ -31,9 +36,10 @@ Not all Android-powered devices support VOIP functionality with SIP. Before perf activity, you should call {@link android.net.sip.SipManager#isVoipSupported isVoipSupported()} to verify that the device supports VOIP calling and {@link android.net.sip.SipManager#isApiSupported isApiSupported()} to verify that the device supports the -SIP APIs.<br/><br/> +SIP APIs. Your application must also request the {@link android.Manifest.permission#INTERNET} and {@link android.Manifest.permission#USE_SIP} permissions in order to use the SIP APIs. </p> + </BODY> </HTML>
\ No newline at end of file |