<supports-screen> element, the system
@@ -324,7 +324,7 @@ determining the density of the current device screen.targetSdkVersion: Indicates the API Level that the application is targeting.
It is able to run on older versions (down to minSdkVersion), but was explicitly tested to
diff --git a/docs/html/about/versions/android-4.0.3.jd b/docs/html/about/versions/android-4.0.3.jd
index bcfa35c94bce8..c4b503ce530c7 100644
--- a/docs/html/about/versions/android-4.0.3.jd
+++ b/docs/html/about/versions/android-4.0.3.jd
@@ -217,7 +217,7 @@ is in use.A new package, {@link android.net.wifi.p2p}, contains all the APIs for performing peer-to-peer connections with Wi-Fi. The primary class you need to work with is {@link android.net.wifi.p2p.WifiP2pManager}, which you can acquire by calling {@link -android.app.Activity#getSystemService getSystemService(WIFI_P2P_SERVICE)}. The {@link -android.net.wifi.p2p.WifiP2pManager} includes APIs that allow you to:
+android.app.Activity#getSystemService(java.lang.String) getSystemService(WIFI_P2P_SERVICE)}. +The {@link android.net.wifi.p2p.WifiP2pManager} includes APIs that allow you to:Android now allows your app to display unique content on additional screens that are connected to the user’s device over either a wired connection or Wi-Fi. To create unique content for a secondary display, extend the {@link android.app.Presentation} -class and implement the {@link android.app.Presentation#onCreate onCreate()} callback. Within -{@link android.app.Presentation#onCreate onCreate()}, specify your UI for the secondary display -by calling {@link android.app.Presentation#setContentView setContentView()}. +class and implement the {@link android.app.Dialog#onCreate onCreate()} callback. Within +{@link android.app.Dialog#onCreate onCreate()}, specify your UI for the secondary display +by calling {@link android.app.Dialog#setContentView setContentView()}. As an extension of the {@link android.app.Dialog} class, the {@link android.app.Presentation} class provides the region in which your app can display a unique UI on the secondary display.
@@ -241,13 +241,13 @@ appear on the secondary display.To detect at runtime when a new display has been connected, create an instance of {@link android.media.MediaRouter.SimpleCallback} in which you implement the {@link -android.media.MediaRouter.SimpleCallback#onRoutePresentationDisplayChanged +android.media.MediaRouter.Callback#onRoutePresentationDisplayChanged onRoutePresentationDisplayChanged()} callback method, which the system will call when a new presentation display is connected. Then register the {@link android.media.MediaRouter.SimpleCallback} by passing it to {@link android.media.MediaRouter#addCallback MediaRouter.addCallback()} along with the {@link android.media.MediaRouter#ROUTE_TYPE_LIVE_VIDEO} route type. When you receive a call to -{@link android.media.MediaRouter.SimpleCallback#onRoutePresentationDisplayChanged +{@link android.media.MediaRouter.Callback#onRoutePresentationDisplayChanged onRoutePresentationDisplayChanged()}, simply call {@link android.media.MediaRouter#getSelectedRoute MediaRouter.getSelectedRoute()} as mentioned above.
@@ -262,7 +262,7 @@ applied to your application or activity. likely a different screen density. Because the screen characteristics may different, you should provide resources that are optimized specifically for such larger displays. If you need to request additional resources from your {@link -android.app.Presentation}, call {@link android.app.Presentation#getContext()}{@link +android.app.Presentation}, call {@link android.app.Dialog#getContext()}{@link android.content.Context#getResources .getResources()} to get the {@link android.content.res.Resources} object corresponding to the display. This provides the appropriate resources from your app that are best suited for the @@ -510,7 +510,7 @@ common operations for you such as:To use a script intrinsic, call the static create() method of each instrinsic
to create an instance of the script. You then call the available set()
methods of each script intrinsic to set any necessary inputs and options.
- Finally, call the {@link android.renderscript.ScriptC#forEach forEach()}
+ Finally, call the {@link android.renderscript.Script#forEach forEach()}
method to execute the script.
To track changes to inserts and updates, you can now include the {@link android.provider.ContactsContract.ContactsColumns#CONTACT_LAST_UPDATED_TIMESTAMP} parameter with your selection to query only the contacts that have changed since the last time you queried the provider.
-To track which contacts have been deleted, the new table {@link android.provider.ContactsContract.DeletedContacts} provides a log of contacts that have been deleted (but each contact deleted is held in this table for a limited time). Similar to {@link android.provider.ContactsContract.ContactsColumns#CONTACT_LAST_UPDATED_TIMESTAMP}, you can use the new selection parameter, {@link android.provider.ContactsContract.DeletedContacts#CONTACT_DELETED_TIMESTAMP} to check which contacts have been deleted since the last time you queried the provider. The table also contains the constant {@link android.provider.ContactsContract.DeletedContacts#DAYS_KEPT_MILLISECONDS} containing the number of days (in milliseconds) that the log will be kept.
+To track which contacts have been deleted, the new table {@link android.provider.ContactsContract.DeletedContacts} provides a log of contacts that have been deleted (but each contact deleted is held in this table for a limited time). Similar to {@link android.provider.ContactsContract.ContactsColumns#CONTACT_LAST_UPDATED_TIMESTAMP}, you can use the new selection parameter, {@link android.provider.ContactsContract.DeletedContactsColumns#CONTACT_DELETED_TIMESTAMP} to check which contacts have been deleted since the last time you queried the provider. The table also contains the constant {@link android.provider.ContactsContract.DeletedContacts#DAYS_KEPT_MILLISECONDS} containing the number of days (in milliseconds) that the log will be kept.
Additionally, the Contacts Provider now broadcasts the {@link android.provider.ContactsContract.Intents#CONTACTS_DATABASE_CREATED} action when the user diff --git a/docs/html/about/versions/marshmallow/android-6.0-changes.jd b/docs/html/about/versions/marshmallow/android-6.0-changes.jd index b44142e9842ab..65c976beb7b95 100644 --- a/docs/html/about/versions/marshmallow/android-6.0-changes.jd +++ b/docs/html/about/versions/marshmallow/android-6.0-changes.jd @@ -280,7 +280,7 @@ change fixes a problem where Dalvik was checking access rules incorrectly in pre If your app uses the {@link java.lang.reflect.Constructor#newInstance(java.lang.Object...) newInstance()} method and you want to override access checks, call the -{@link java.lang.reflect.Constructor#setAccessible(boolean) setAccessible()} method with the input +{@link java.lang.reflect.AccessibleObject#setAccessible(boolean) setAccessible()} method with the input parameter set to {@code true}. If your app uses the v7 appcompat library or the v7 recyclerview library, diff --git a/docs/html/about/versions/marshmallow/android-6.0.jd b/docs/html/about/versions/marshmallow/android-6.0.jd index 240b08020db74..247c6d1cd0402 100644 --- a/docs/html/about/versions/marshmallow/android-6.0.jd +++ b/docs/html/about/versions/marshmallow/android-6.0.jd @@ -129,8 +129,8 @@ in your app.
adb -e emu finger touch <finger_id>-
On Windows, you may have to run {@code telnet 127.0.0.1 <emulator-id>} followed by - {@code finger touch <finger_id>}. +
On Windows, you may have to run {@code telnet 127.0.0.1
For each activity that you want to expose to
{@link android.service.chooser.ChooserTargetService}, add a
-{@code <meta-data>} element with the name
+{@code
The {@code IInAppBillingService.aidl} file will be installed to {@code <sdk>/extras/google/play_billing/}.
+The {@code IInAppBillingService.aidl} file will be installed to {@code
To add the AIDL to your project:
@@ -116,7 +116,7 @@ method calls. OK."First" is emphasized because although the Developer Console allows you to re-use an uploaded expansion file with a new APK, the expansion file's name does not change—it retains the version applied to it when you first uploaded the file.
The method takes the following parameters:
context: Your application's {@link android.content.Context}.In order to instantiate your {@code IStub} by calling {@code CreateStub()}, you must pass it @@ -956,7 +956,7 @@ which explains how to implement a license policy such as this one.
depends on the type of file you've used. As discussed in the overview, your expansion files can be any kind of file you want, but are renamed using a particular file name format and are saved to -{@code <shared-storage>/Android/obb/<package-name>/}. +{@codeRegardless of how you read your files, you should always first check that the external storage is available for reading. There's a chance that the user has the storage mounted to a @@ -1059,7 +1059,7 @@ option to specify the file suffixes that should not be compressed:
The Google Market Apk Expansion package includes a library called the APK
Expansion Zip Library (located in {@code
-<sdk>/extras/google/google_market_apk_expansion/zip_file/}). This is an optional library that
+
library directory (the directory containing the library's AndroidManifest.xml file)
-as the project root ({@code <sdk>/extras/google/play_licensing/library/AndroidManifest.xml}),
+as the project root ({@code If necessary, you can prevent users from installing your app when their devices don't provide a
given feature by declaring it with a {@code <uses-feature>}
+"{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code
The API level allows you to declare the minimum version with which your app is
compatible, using the {@code
-<uses-sdk>} manifest tag and its
+
Similar to regular headset and A2DP profile devices, you must call {@link android.bluetooth.BluetoothAdapter#getProfileProxy getProfileProxy()} with a {@link android.bluetooth.BluetoothProfile.ServiceListener} and the {@link -android.bluetooth.BluetoothProfile.ServiceListener#HEALTH} profile type to +android.bluetooth.BluetoothProfile#HEALTH} profile type to establish a connection with the profile proxy object.
As a best practice, you should still declare your requirement for this
- orientation using a {@code <uses-feature>} element. If you declare
+ orientation using a {@code
If you query on a {@link
-android.provider.CalendarContract.Calendars#ACCOUNT_NAME
+android.provider.CalendarContract.SyncColumns#ACCOUNT_NAME
Calendars.ACCOUNT_NAME}, you must also include
-{@link android.provider.CalendarContract.Calendars#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE}
+{@link android.provider.CalendarContract.SyncColumns#ACCOUNT_TYPE Calendars.ACCOUNT_TYPE}
in the selection. That is because a given account is
only considered unique given both its ACCOUNT_NAME and its
ACCOUNT_TYPE. The ACCOUNT_TYPE is the string corresponding to the
diff --git a/docs/html/guide/topics/providers/contacts-provider.jd b/docs/html/guide/topics/providers/contacts-provider.jd
index 2b145585ab837..ac855aa0ab272 100644
--- a/docs/html/guide/topics/providers/contacts-provider.jd
+++ b/docs/html/guide/topics/providers/contacts-provider.jd
@@ -329,13 +329,13 @@ page.title=Contacts Provider
_ID column of the raw contact for this data.
diff --git a/docs/html/guide/topics/renderscript/compute.jd b/docs/html/guide/topics/renderscript/compute.jd index c5b49d70435f0..fe686547fe6c8 100755 --- a/docs/html/guide/topics/renderscript/compute.jd +++ b/docs/html/guide/topics/renderscript/compute.jd @@ -16,13 +16,6 @@ parent.link=index.html
RenderScript is a framework for running computationally intensive tasks at high performance on Android. RenderScript is primarily oriented for use with data-parallel computation, although serial -workloads can benefit as well. The RenderScript runtime parallelizes -work across processors available on a device, such as multi-core CPUs and GPUs. This allows -you to focus on expressing algorithms rather than scheduling work. RenderScript is +computationally intensive workloads can benefit as well. The RenderScript runtime will parallelize +work across all processors available on a device, such as multi-core CPUs, GPUs, or DSPs, allowing +you to focus on expressing algorithms rather than scheduling work or load balancing. RenderScript is especially useful for applications performing image processing, computational photography, or computer vision.
To begin with RenderScript, there are two main concepts you should understand:
A RenderScript kernel typically resides in a .rs file in the
<project_root>/src/ directory; each .rs file is called a
-script. Every script contains its own set of kernels, functions, and variables. A script can
+script. Every script contains its own set of kernels, functions, and variables. A script can
contain:
#pragma rs java_package_name(com.example.app)) that
declares the package name of the Java classes reflected from this script.
-Note that your .rs file must be part of your application package, and not in a
+Note that your .rs file must be part of your application package, and not in a
library project.Zero or more script globals. A script global is equivalent to a global variable in C. You can +
Zero or more compute kernels. There are two kinds of compute -kernels: mapping kernels (also called foreach kernels) -and reduction kernels.
+A mapping kernel is a parallel function that operates on a collection of {@link - android.renderscript.Allocation Allocations} of the same dimensions. By default, it executes - once for every coordinate in those dimensions. It is typically (but not exclusively) used to - transform a collection of input {@link android.renderscript.Allocation Allocations} to an - output {@link android.renderscript.Allocation} one {@link android.renderscript.Element} at a - time.
+A simple kernel may look like the following:
-Here is an example of a simple mapping kernel:
- -uchar4 RS_KERNEL invert(uchar4 in, uint32_t x, uint32_t y) {
+uchar4 __attribute__((kernel)) invert(uchar4 in, uint32_t x, uint32_t y) {
uchar4 out = in;
out.r = 255 - in.r;
out.g = 255 - in.g;
@@ -99,113 +81,40 @@ and reduction kernels.
return out;
}
-In most respects, this is identical to a standard C
- function. The RS_KERNEL property applied to the
- function prototype specifies that the function is a RenderScript mapping kernel instead of an
- invokable function. The in argument is automatically filled in based on the
- input {@link android.renderscript.Allocation} passed to the kernel launch. The
- arguments x and y are
- discussed below. The value returned from the kernel is
- automatically written to the appropriate location in the output {@link
- android.renderscript.Allocation}. By default, this kernel is run across its entire input
- {@link android.renderscript.Allocation}, with one execution of the kernel function per {@link
- android.renderscript.Element} in the {@link android.renderscript.Allocation}.
+In most respects, this is identical to a standard C function. The first notable feature is the
+__attribute__((kernel)) applied to the function prototype. This denotes that the
+function is a RenderScript kernel instead of an invokable function. The next feature is the
+in argument and its type. In a RenderScript kernel, this is a special argument that is
+automatically filled in based on the input {@link android.renderscript.Allocation} passed to the
+kernel launch. By default, the kernel is run across an entire {@link
+android.renderscript.Allocation}, with one execution of the kernel body per {@link
+android.renderscript.Element} in the {@link android.renderscript.Allocation}. The third notable
+feature is the return type of the kernel. The value returned from the kernel is automatically
+written to the appropriate location in the output {@link android.renderscript.Allocation}. The
+RenderScript runtime checks to ensure that the {@link android.renderscript.Element} types of the
+input and output Allocations match the kernel's prototype; if they do not match, an exception is
+thrown.
-A mapping kernel may have one or more input {@link android.renderscript.Allocation
- Allocations}, a single output {@link android.renderscript.Allocation}, or both. The
- RenderScript runtime checks to ensure that all input and output Allocations have the same
- dimensions, and that the {@link android.renderscript.Element} types of the input and output
- Allocations match the kernel's prototype; if either of these checks fails, RenderScript
- throws an exception.
+A kernel may have an input {@link android.renderscript.Allocation}, an output {@link
+android.renderscript.Allocation}, or both. A kernel may not have more than one input or one output
+{@link android.renderscript.Allocation}. If more than one input or output is required, those objects
+should be bound to rs_allocation script globals and accessed from a kernel or invokable
+function via rsGetElementAt_type() or
+rsSetElementAt_type().
-NOTE: Before Android 6.0 (API level 23), a mapping kernel may
- not have more than one input {@link android.renderscript.Allocation}.
-
-If you need more input or output {@link android.renderscript.Allocation Allocations} than
- the kernel has, those objects should be bound to rs_allocation script globals
- and accessed from a kernel or invokable function
- via rsGetElementAt_type() or rsSetElementAt_type().
-
-NOTE: RS_KERNEL is a macro
- defined automatically by RenderScript for your convenience:
-
-#define RS_KERNEL __attribute__((kernel))
-
-A reduction kernel is a family of functions that operates on a collection of input - {@link android.renderscript.Allocation Allocations} of the same dimensions. By default, - its accumulator function executes once for every - coordinate in those dimensions. It is typically (but not exclusively) used to "reduce" a - collection of input {@link android.renderscript.Allocation Allocations} to a single - value.
- -Here is an example of a simple reduction -kernel that adds up the {@link android.renderscript.Element Elements} of its -input:
- -#pragma rs reduce(addint) accumulator(addintAccum)
-
-static void addintAccum(int *accum, int val) {
- *accum += val;
-}
-
-A reduction kernel consists of one or more user-written functions.
-#pragma rs reduce is used to define the kernel by specifying its name
-(addint, in this example) and the names and roles of the functions that make
-up the kernel (an accumulator function addintAccum, in this
-example). All such functions must be static. A reduction kernel always
-requires an accumulator function; it may also have other functions, depending
-on what you want the kernel to do.
A reduction kernel accumulator function must return void and must have at least
-two arguments. The first argument (accum, in this example) is a pointer to
-an accumulator data item and the second (val, in this example) is
-automatically filled in based on the input {@link android.renderscript.Allocation} passed to
-the kernel launch. The accumulator data item is created by the RenderScript runtime; by
-default, it is initialized to zero. By default, this kernel is run across its entire input
-{@link android.renderscript.Allocation}, with one execution of the accumulator function per
-{@link android.renderscript.Element} in the {@link android.renderscript.Allocation}. By
-default, the final value of the accumulator data item is treated as the result of the
-reduction, and is returned to Java. The RenderScript runtime checks to ensure that the {@link
-android.renderscript.Element} type of the input Allocation matches the accumulator function's
-prototype; if it does not match, RenderScript throws an exception.
A reduction kernel has one or more input {@link android.renderscript.Allocation -Allocations} but no output {@link android.renderscript.Allocation Allocations}.
Reduction kernels are explained in more detail here.
- -Reduction kernels are supported in Android Nougat (API level 24) and later.
-A mapping kernel function or a reduction kernel accumulator function may access the coordinates
-of the current execution using the special arguments x,
-y, and z, which must be of type int or uint32_t.
-These arguments are optional.
A mapping kernel function or a reduction kernel accumulator
-function may also take the optional special argument
-context of type rs_kernel_context.
-It is needed by a family of runtime APIs that are used to query
-certain properties of the current execution -- for example, rsGetDimX.
-(The context argument is available in Android 6.0 (API level 23) and later.)
A kernel may access the coordinates of the current execution using the x,
+y, and z arguments. These arguments are optional, but the type of the
+coordinate arguments must be uint32_t.
init() function. An init() function is a special type of
-invokable function that RenderScript runs when the script is first instantiated. This allows for some
+invokable function that is run when the script is first instantiated. This allows for some
computation to occur automatically at script creation.static.static.
#pragma rs_fp_relaxed: For apps that don’t require strict IEEE 754-2008
+ #pragma rs_fp_relaxed - For apps that don’t require strict IEEE 754-2008
compliance and can tolerate less precision. This mode enables flush-to-zero for denorms and
round-towards-zero.
#pragma rs_fp_imprecise: For apps that don’t have stringent precision
+ #pragma rs_fp_imprecise - For apps that don’t have stringent precision
requirements. This mode enables everything in rs_fp_relaxed along with the
following:
@@ -253,21 +162,14 @@ precision (such as SIMD CPU instructions).
available on devices running Android 3.0 (API level 11) and higher. Here are the tradeoffs:
+We strongly recommend using the Support Library APIs for accessing RenderScript because they + provide a wider range of device compatibility. Developers targeting specific versions of + Android can use {@link android.renderscript} if necessary.
-Using RenderScript from Java code relies on the API classes located in the {@link android.renderscript} or the {@link android.support.v8.renderscript} package. Most -applications follow the same basic usage pattern:
+applications follow the same basic usage patterns:rsGetElementAt_type() and
-rsSetElementAt_type() when bound as script globals. {@link
+accessed in kernels using rsGetElementAt_type() and
+rsSetElementAt_type() when bound as script globals. {@link
android.renderscript.Allocation} objects allow arrays to be passed from Java code to RenderScript
code and vice-versa. {@link android.renderscript.Allocation} objects are typically created using
-{@link android.renderscript.Allocation#createTyped createTyped()} or {@link
-android.renderscript.Allocation#createFromBitmap createFromBitmap()}.
+{@link android.renderscript.Allocation#createTyped} or {@link
+android.renderscript.Allocation#createFromBitmap}.
ScriptC_filename. For example, if the mapping kernel
-above were located in invert.rs and a RenderScript context were already located in
-mRenderScript, the Java code to instantiate the script would be:
+this class will have the name ScriptC_filename. For example, if the kernel
+above was located in invert.rs and a RenderScript context was already located in
+mRS, the Java code to instantiate the script would be:
ScriptC_invert invert = new ScriptC_invert(mRenderScript);
copy methods in {@link
+android.renderscript.Allocation}.
-ScriptC_filename class named set_globalname. For
- example, in order to set an int variable named threshold, use the
- Java method set_threshold(int); and in order to set
- an rs_allocation variable named lookup, use the Java
- method set_lookup(Allocation). The set methods
- are asynchronous.ScriptC_filename class with methods named
+set_globalname. For example, in order to set an int named
+elements, use the Java method set_elements(int). RenderScript objects can
+also be set in kernels; for example, the rs_allocation variable named
+lookup can be set with the method set_lookup(Allocation).Methods to launch a given kernel are
-reflected in the same ScriptC_filename class with methods named
-forEach_mappingKernelName()
-or reduce_reductionKernelName().
-These launches are asynchronous.
-Depending on the arguments to the kernel, the
-method takes one or more Allocations, all of which must have the same dimensions. By default, a
-kernel executes over every coordinate in those dimensions; to execute a kernel over a subset of those coordinates,
-pass an appropriate {@link
-android.renderscript.Script.LaunchOptions} as the last argument to the forEach or reduce method.
ScriptC_filename class with methods named
+forEach_kernelname(). These launches are asynchronous, and launches will be
+serialized in the order in which they are launched. Depending on the arguments to the kernel, the
+method will take either one or two Allocations. By default, a kernel will execute over the entire
+input or output Allocation; to execute over a subset of that Allocation, pass an appropriate {@link
+android.renderscript.Script.LaunchOptions} as the last argument to the forEach method.
-Launch invokable functions using the invoke_functionName methods
-reflected in the same ScriptC_filename class.
-These launches are asynchronous.
Invoked functions can be launched using the invoke_functionname methods
+reflected in the same ScriptC_filename class.
javaFutureType.get() method.
-The "copy" and get() methods are synchronous.copy methods in {@link
+android.renderscript.Allocation}. These functions will synchronize with asynchronous kernel and
+function launches as necessary.The reflected forEach, invoke, reduce,
- and set methods are asynchronous -- each may return to Java before completing the
- requested action. However, the individual actions are serialized in the order in which they are launched.
The {@link android.renderscript.Allocation} class provides "copy" methods to copy data to - and from Allocations. A "copy" method is synchronous, and is serialized with respect to any - of the asynchronous actions above that touch the same Allocation.
- -The reflected javaFutureType classes provide
- a get() method to obtain the result of a reduction. get() is
- synchronous, and is serialized with respect to the reduction (which is asynchronous).
Reduction is the process of combining a collection of data into a single -value. This is a useful primitive in parallel programming, with applications such as the -following:
-and, or, xor)
- over all the dataIn Android Nougat (API level 24) and later, RenderScript supports reduction kernels to allow -efficient user-written reduction algorithms. You may launch reduction kernels on inputs with -1, 2, or 3 dimensions.
- -
An example above shows a simple addint reduction kernel.
-Here is a more complicated findMinAndMax reduction kernel
-that finds the locations of the minimum and maximum long values in a
-1-dimensional {@link android.renderscript.Allocation}:
-#define LONG_MAX (long)((1UL << 63) - 1) -#define LONG_MIN (long)(1UL << 63) - -#pragma rs reduce(findMinAndMax) \ - initializer(fMMInit) accumulator(fMMAccumulator) \ - combiner(fMMCombiner) outconverter(fMMOutConverter) - -// Either a value and the location where it was found, or INITVAL. -typedef struct { - long val; - int idx; // -1 indicates INITVAL -} IndexedVal; - -typedef struct { - IndexedVal min, max; -} MinAndMax; - -// In discussion below, this initial value { { LONG_MAX, -1 }, { LONG_MIN, -1 } } -// is called INITVAL. -static void fMMInit(MinAndMax *accum) { - accum->min.val = LONG_MAX; - accum->min.idx = -1; - accum->max.val = LONG_MIN; - accum->max.idx = -1; -} - -//---------------------------------------------------------------------- -// In describing the behavior of the accumulator and combiner functions, -// it is helpful to describe hypothetical functions -// IndexedVal min(IndexedVal a, IndexedVal b) -// IndexedVal max(IndexedVal a, IndexedVal b) -// MinAndMax minmax(MinAndMax a, MinAndMax b) -// MinAndMax minmax(MinAndMax accum, IndexedVal val) -// -// The effect of -// IndexedVal min(IndexedVal a, IndexedVal b) -// is to return the IndexedVal from among the two arguments -// whose val is lesser, except that when an IndexedVal -// has a negative index, that IndexedVal is never less than -// any other IndexedVal; therefore, if exactly one of the -// two arguments has a negative index, the min is the other -// argument. Like ordinary arithmetic min and max, this function -// is commutative and associative; that is, -// -// min(A, B) == min(B, A) // commutative -// min(A, min(B, C)) == min((A, B), C) // associative -// -// The effect of -// IndexedVal max(IndexedVal a, IndexedVal b) -// is analogous (greater . . . never greater than). -// -// Then there is -// -// MinAndMax minmax(MinAndMax a, MinAndMax b) { -// return MinAndMax(min(a.min, b.min), max(a.max, b.max)); -// } -// -// Like ordinary arithmetic min and max, the above function -// is commutative and associative; that is: -// -// minmax(A, B) == minmax(B, A) // commutative -// minmax(A, minmax(B, C)) == minmax((A, B), C) // associative -// -// Finally define -// -// MinAndMax minmax(MinAndMax accum, IndexedVal val) { -// return minmax(accum, MinAndMax(val, val)); -// } -//---------------------------------------------------------------------- - -// This function can be explained as doing: -// *accum = minmax(*accum, IndexedVal(in, x)) -// -// This function simply computes minimum and maximum values as if -// INITVAL.min were greater than any other minimum value and -// INITVAL.max were less than any other maximum value. Note that if -// *accum is INITVAL, then this function sets -// *accum = IndexedVal(in, x) -// -// After this function is called, both accum->min.idx and accum->max.idx -// will have nonnegative values: -// - x is always nonnegative, so if this function ever sets one of the -// idx fields, it will set it to a nonnegative value -// - if one of the idx fields is negative, then the corresponding -// val field must be LONG_MAX or LONG_MIN, so the function will always -// set both the val and idx fields -static void fMMAccumulator(MinAndMax *accum, long in, int x) { - IndexedVal me; - me.val = in; - me.idx = x; - - if (me.val <= accum->min.val) - accum->min = me; - if (me.val >= accum->max.val) - accum->max = me; -} - -// This function can be explained as doing: -// *accum = minmax(*accum, *val) -// -// This function simply computes minimum and maximum values as if -// INITVAL.min were greater than any other minimum value and -// INITVAL.max were less than any other maximum value. Note that if -// one of the two accumulator data items is INITVAL, then this -// function sets *accum to the other one. -static void fMMCombiner(MinAndMax *accum, - const MinAndMax *val) { - if ((accum->min.idx < 0) || (val->min.val < accum->min.val)) - accum->min = val->min; - if ((accum->max.idx < 0) || (val->max.val > accum->max.val)) - accum->max = val->max; -} - -static void fMMOutConverter(int2 *result, - const MinAndMax *val) { - result->x = val->min.idx; - result->y = val->max.idx; -} -- -
NOTE: There are more example reduction - kernels here.
- -In order to run a reduction kernel, the RenderScript runtime creates one or more
-variables called accumulator data
-items to hold the state of the reduction process. The RenderScript runtime
-picks the number of accumulator data items in such a way as to maximize performance. The type
-of the accumulator data items (accumType) is determined by the kernel's accumulator
-function -- the first argument to that function is a pointer to an accumulator data
-item. By default, every accumulator data item is initialized to zero (as if
-by memset); however, you may write an initializer function to do something
-different.
Example: In the addint
-kernel, the accumulator data items (of type int) are used to add up input
-values. There is no initializer function, so each accumulator data item is initialized to
-zero.
Example: In
-the findMinAndMax kernel, the accumulator data items
-(of type MinAndMax) are used to keep track of the minimum and maximum values
-found so far. There is an initializer function to set these to LONG_MAX and
-LONG_MIN, respectively; and to set the locations of these values to -1, indicating that
-the values are not actually present in the (empty) portion of the input that has been
-processed.
RenderScript calls your accumulator function once for every coordinate in the -input(s). Typically, your function should update the accumulator data item in some way -according to the input.
- -Example: In the addint -kernel, the accumulator function adds the value of an input Element to the accumulator -data item.
- -Example: In -the findMinAndMax kernel, the accumulator function -checks to see whether the value of an input Element is less than or equal to the minimum -value recorded in the accumulator data item and/or greater than or equal to the maximum -value recorded in the accumulator data item, and updates the accumulator data item -accordingly.
- -After the accumulator function has been called once for every coordinate in the input(s), -RenderScript must combine the accumulator -data items together into a single accumulator data item. You may write a combiner -function to do this. If the accumulator function has a single input and -no special arguments, then you do not need to write a combiner -function; RenderScript will use the accumulator function to combine the accumulator data -items. (You may still write a combiner function if this default behavior is not what you -want.)
- -Example: In the addint -kernel, there is no combiner function, so the accumulator function will be used. This is -the correct behavior, because if we split a collection of values into two pieces, and we -add up the values in those two pieces separately, adding up those two sums is the same as -adding up the entire collection.
- -Example: In
-the findMinAndMax kernel, the combiner function
-checks to see whether the minimum value recorded in the "source" accumulator data
-item *val is less then the minimum value recorded in the "destination"
-accumulator data item *accum, and updates *accum
-accordingly. It does similar work for the maximum value. This updates *accum
-to the state it would have had if all of the input values had been accumulated into
-*accum rather than some into *accum and some into
-*val.
After all of the accumulator data items have been combined, RenderScript determines -the result of the reduction to return to Java. You may write an outconverter -function to do this. You do not need to write an outconverter function if you want -the final value of the combined accumulator data items to be the result of the reduction.
- -Example: In the addint kernel, -there is no outconverter function. The final value of the combined data items is the sum of -all Elements of the input, which is the value we want to return.
- -Example: In
-the findMinAndMax kernel, the outconverter function
-initializes an int2 result value to hold the locations of the minimum and
-maximum values resulting from the combination of all of the accumulator data items.
#pragma rs reduce defines a reduction kernel by
-specifying its name and the names and roles of the functions that make
-up the kernel. All such functions must be
-static. A reduction kernel always requires an accumulator
-function; you can omit some or all of the other functions, depending on what you want the
-kernel to do.
#pragma rs reduce(kernelName) \ - initializer(initializerName) \ - accumulator(accumulatorName) \ - combiner(combinerName) \ - outconverter(outconverterName) -- -
The meaning of the items in the #pragma is as follows:
reduce(kernelName) (mandatory): Specifies that a reduction kernel is
-being defined. A reflected Java method reduce_kernelName will launch the
-kernel.initializer(initializerName) (optional): Specifies the name of the
-initializer function for this reduction kernel. When you launch the kernel, RenderScript calls
-this function once for each accumulator data item. The
-function must be defined like this:
static void initializerName(accumType *accum) { … }
-
-accum is a pointer to an accumulator data item for this function to
-initialize.
If you do not provide an initializer function, RenderScript initializes every accumulator
-data item to zero (as if by memset), behaving as if there were an initializer
-function that looks like this:
static void initializerName(accumType *accum) {
- memset(accum, 0, sizeof(*accum));
-}
-accumulator(accumulatorName)
-(mandatory): Specifies the name of the accumulator function for this
-reduction kernel. When you launch the kernel, RenderScript calls
-this function once for every coordinate in the input(s), to update an
-accumulator data item in some way according to the input(s). The function
-must be defined like this:
-static void accumulatorName(accumType *accum,
- in1Type in1, …, inNType inN
- [, specialArguments]) { … }
-
-
-accum is a pointer to an accumulator data item for this function to
-modify. in1 through inN are one or more arguments that
-are automatically filled in based on the inputs passed to the kernel launch, one argument
-per input. The accumulator function may optionally take any of the special arguments.
An example kernel with multiple inputs is dotProduct.
combiner(combinerName)
-(optional): Specifies the name of the combiner function for this
-reduction kernel. After RenderScript calls the accumulator function
-once for every coordinate in the input(s), it calls this function as many
-times as necessary to combine all accumulator data items into a single
-accumulator data item. The function must be defined like this:
-
-static void combinerName(accumType *accum, const accumType *other) { … }
-
-accum is a pointer to a "destination" accumulator data item for this
-function to modify. other is a pointer to a "source" accumulator data item
-for this function to "combine" into *accum.
NOTE: It is possible
- that *accum, *other, or both have been initialized but have never
- been passed to the accumulator function; that is, one or both have never been updated
- according to any input data. For example, in
- the findMinAndMax kernel, the combiner
- function fMMCombiner explicitly checks for idx < 0 because that
- indicates such an accumulator data item, whose value is INITVAL.
If you do not provide a combiner function, RenderScript uses the accumulator function in its -place, behaving as if there were a combiner function that looks like this:
- -static void combinerName(accumType *accum, const accumType *other) {
- accumulatorName(accum, *other);
-}
-
-A combiner function is mandatory if the kernel has more than one input, if the input data - type is not the same as the accumulator data type, or if the accumulator function takes one - or more special arguments.
-outconverter(outconverterName)
-(optional): Specifies the name of the outconverter function for this
-reduction kernel. After RenderScript combines all of the accumulator
-data items, it calls this function to determine the result of the
-reduction to return to Java. The function must be defined like
-this:
static void outconverterName(resultType *result, const accumType *accum) { … }
-
-result is a pointer to a result data item (allocated but not initialized
-by the RenderScript runtime) for this function to initialize with the result of the
-reduction. resultType is the type of that data item, which need not be the same
-as accumType. accum is a pointer to the final accumulator data item
-computed by the combiner function.
If you do not provide an outconverter function, RenderScript copies the final accumulator -data item to the result data item, behaving as if there were an outconverter function that -looks like this:
- -static void outconverterName(accumType *result, const accumType *accum) {
- *result = *accum;
-}
-
-If you want a different result type than the accumulator data type, then the outconverter function is mandatory.
-Note that a kernel has input types, an accumulator data item type, and a result type,
- none of which need to be the same. For example, in
- the findMinAndMax kernel, the input
- type long, accumulator data item type MinAndMax, and result
- type int2 are all different.
You must not rely on the number of accumulator data items created by RenderScript for a - given kernel launch. There is no guarantee that two launches of the same kernel with the - same input(s) will create the same number of accumulator data items.
- -You must not rely on the order in which RenderScript calls the initializer, accumulator, and - combiner functions; it may even call some of them in parallel. There is no guarantee that - two launches of the same kernel with the same input will follow the same order. The only - guarantee is that only the initializer function will ever see an uninitialized accumulator - data item. For example:
-One consequence of this is that the findMinAndMax - kernel is not deterministic: If the input contains more than one occurrence of the same - minimum or maximum value, you have no way of knowing which occurrence the kernel will - find.
- -Because the RenderScript system can choose to execute a kernel in many - different ways, you must follow certain rules to ensure that your kernel behaves the - way you want. If you do not follow these rules, you may get incorrect results, - nondeterministic behavior, or runtime errors.
- -The rules below often say that two accumulator data items must have "the - same value". What does this mean? That depends on what you want the kernel to do. For - a mathematical reduction such as addint, it usually makes sense - for "the same" to mean mathematical equality. For a "pick any" search such - as findMinAndMax ("find the location of minimum and - maximum input values") where there might be more than one occurrence of identical input - values, all locations of a given input value must be considered "the same". You could write - a similar kernel to "find the location of leftmost minimum and maximum input values" - where (say) a minimum value at location 100 is preferred over an identical minimum value at location - 200; for this kernel, "the same" would mean identical location, not merely - identical value, and the accumulator and combiner functions would have to be - different than those for findMinAndMax.
- -The initializer function must create an identity value. That is, - ifI and A are accumulator data items initialized
- by the initializer function, and I has never been passed to the
- accumulator function (but A may have been), then
-
-Example: In the addint - kernel, an accumulator data item is initialized to zero. The combiner function for this - kernel performs addition; zero is the identity value for addition.
-Example: In the findMinAndMax
- kernel, an accumulator data item is initialized
- to INITVAL.
-
fMMCombiner(&A, &I) leaves A the same,
- because I is INITVAL.fMMCombiner(&I, &A) sets I
- to A, because I is INITVAL.INITVAL is indeed an identity value.
-The combiner function must be commutative. That is,
- if A and B are accumulator data items initialized
- by the initializer function, and that may have been passed to the accumulator function zero
- or more times, then combinerName(&A, &B) must
- set A to the same value
- that combinerName(&B, &A)
- sets B.
Example: In the addint - kernel, the combiner function adds the two accumulator data item values; addition is - commutative.
-Example: In the findMinAndMax kernel, -
-fMMCombiner(&A, &B) --is the same as -
-A = minmax(A, B) --and
minmax is commutative, so fMMCombiner is also.
-
-The combiner function must be associative. That is,
- if A, B, and C are
- accumulator data items initialized by the initializer function, and that may have been passed
- to the accumulator function zero or more times, then the following two code sequences must
- set A to the same value:
-combinerName(&A, &B); -combinerName(&A, &C); -
-combinerName(&B, &C); -combinerName(&A, &B); -
Example: In the addint kernel, the - combiner function adds the two accumulator data item values: -
-A = A + B -A = A + C -// Same as -// A = (A + B) + C -
-B = B + C -A = A + B -// Same as -// A = A + (B + C) -// B = B + C -
Example: In the findMinAndMax kernel, -
-fMMCombiner(&A, &B) --is the same as -
-A = minmax(A, B) --So the two sequences are -
-A = minmax(A, B) -A = minmax(A, C) -// Same as -// A = minmax(minmax(A, B), C) -
-B = minmax(B, C) -A = minmax(A, B) -// Same as -// A = minmax(A, minmax(B, C)) -// B = minmax(B, C) -
minmax is associative, and so fMMCombiner is also.
-
-The accumulator function and combiner function together must obey the basic
- folding rule. That is, if A
- and B are accumulator data items, A has been
- initialized by the initializer function and may have been passed to the accumulator function
- zero or more times, B has not been initialized, and args is
- the list of input arguments and special arguments for a particular call to the accumulator
- function, then the following two code sequences must set A
- to the same value:
-accumulatorName(&A, args); // statement 1 -
-initializerName(&B); // statement 2 -accumulatorName(&B, args); // statement 3 -combinerName(&A, &B); // statement 4 -
Example: In the addint kernel, for an input value V: -
A += VB = 0B += V, which is the same as B = VA += B, which is the same as A += VA to the same value, and so this kernel obeys the
-basic folding rule.
-
-Example: In the findMinAndMax kernel, for an input - value V at coordinate X: -
A = minmax(A, IndexedVal(V, X))B = INITVAL-B = minmax(B, IndexedVal(V, X)) --which, because B is the initial value, is the same as -
-B = IndexedVal(V, X) --
-A = minmax(A, B) --which is the same as -
-A = minmax(A, IndexedVal(V, X)) --
A to the same value, and so this kernel obeys the
-basic folding rule.
-
-For a reduction kernel named kernelName defined in the
-file filename.rs, there are three methods reflected in the
-class ScriptC_filename:
-// Method 1 -public javaFutureType reduce_kernelName(Allocation ain1, …, - Allocation ainN); - -// Method 2 -public javaFutureType reduce_kernelName(Allocation ain1, …, - Allocation ainN, - Script.LaunchOptions sc); - -// Method 3 -public javaFutureType reduce_kernelName(devecSiIn1Type[] in1, …, - devecSiInNType[] inN); -- -
Here are some examples of calling the addint kernel:
--ScriptC_example script = new ScriptC_example(mRenderScript); - -// 1D array -// and obtain answer immediately -int input1[] = …; -int sum1 = script.reduce_addint(input1).get(); // Method 3 - -// 2D allocation -// and do some additional work before obtaining answer -Type.Builder typeBuilder = - new Type.Builder(RS, Element.I32(RS)); -typeBuilder.setX(…); -typeBuilder.setY(…); -Allocation input2 = createTyped(RS, typeBuilder.create()); -populateSomehow(input2); // fill in input Allocation with data -script.result_int result2 = script.reduce_addint(input2); // Method 1 -doSomeAdditionalWork(); // might run at same time as reduction -int sum2 = result2.get(); -- -
Method 1 has one input {@link android.renderscript.Allocation} argument for - every input argument in the kernel's accumulator - function. The RenderScript runtime checks to ensure that all of the input Allocations - have the same dimensions and that the {@link android.renderscript.Element} type of each of - the input Allocations matches that of the corresponding input argument of the accumulator - function's prototype. If any of these checks fail, RenderScript throws an exception. The - kernel executes over every coordinate in those dimensions.
- -Method 2 is the same as Method 1 except that Method 2 takes an additional
- argument sc that can be used to limit the kernel execution to a subset of the
- coordinates.
Method 3 is the same as Method 1 except that
- instead of taking Allocation inputs it takes Java array inputs. This is a convenience that
- saves you from having to write code to explicitly create an Allocation and copy data to it
- from a Java array. However, using Method 3 instead of Method 1 does not increase the
- performance of the code. For each input array, Method 3 creates a temporary
- 1-dimensional Allocation with the appropriate {@link android.renderscript.Element} type and
- {@link android.renderscript.Allocation#setAutoPadding} enabled, and copies the array to the
- Allocation as if by the appropriate copyFrom() method of {@link
- android.renderscript.Allocation}. It then calls Method 1, passing those temporary
- Allocations.
NOTE: If your application will make multiple kernel calls with - the same array, or with different arrays of the same dimensions and Element type, you may improve - performance by explicitly creating, populating, and reusing Allocations yourself, instead of - by using Method 3.
-javaFutureType,
- the return type of the reflected reduction methods, is a reflected
- static nested class within the ScriptC_filename
- class. It represents the future result of a reduction
- kernel run. To obtain the actual result of the run, call
- the get() method of that class, which returns a value
- of type javaResultType. get() is synchronous.
-public class ScriptC_filename extends ScriptC {
- public static class javaFutureType {
- public javaResultType get() { … }
- }
-}
-
-
-javaResultType is determined from the resultType of the - outconverter function. Unless resultType is an - unsigned type (scalar, vector, or array), javaResultType is the directly corresponding - Java type. If resultType is an unsigned type and there is a larger Java signed type, - then javaResultType is that larger Java signed type; otherwise, it is the directly - corresponding Java type. For example:
-int, int2, or int[15],
- then javaResultType is int, Int2,
- or int[]. All values of resultType can be represented
- by javaResultType.uint, uint2, or uint[15],
- then javaResultType is long, Long2,
- or long[]. All values of resultType can be represented
- by javaResultType.ulong, ulong2,
- or ulong[15], then javaResultType
- is long, Long2, or long[]. There are certain values
- of resultType that cannot be represented by javaResultType.javaFutureType is the future result type corresponding - to the resultType of the outconverter - function.
-result_resultType.resultArrayCount_memberType.For example:
- -
-public class ScriptC_filename extends ScriptC {
- // for kernels with int result
- public static class result_int {
- public int get() { … }
- }
-
- // for kernels with int[10] result
- public static class resultArray10_int {
- public int[] get() { … }
- }
-
- // for kernels with int2 result
- // note that the Java type name "Int2" is not the same as the script type name "int2"
- public static class result_int2 {
- public Int2 get() { … }
- }
-
- // for kernels with int2[10] result
- // note that the Java type name "Int2" is not the same as the script type name "int2"
- public static class resultArray10_int2 {
- public Int2[] get() { … }
- }
-
- // for kernels with uint result
- // note that the Java type "long" is a wider signed type than the unsigned script type "uint"
- public static class result_uint {
- public long get() { … }
- }
-
- // for kernels with uint[10] result
- // note that the Java type "long" is a wider signed type than the unsigned script type "uint"
- public static class resultArray10_uint {
- public long[] get() { … }
- }
-
- // for kernels with uint2 result
- // note that the Java type "Long2" is a wider signed type than the unsigned script type "uint2"
- public static class result_uint2 {
- public Long2 get() { … }
- }
-
- // for kernels with uint2[10] result
- // note that the Java type "Long2" is a wider signed type than the unsigned script type "uint2"
- public static class resultArray10_uint2 {
- public Long2[] get() { … }
- }
-}
-
-
-If javaResultType is an object type (including an array type), each call
- to javaFutureType.get() on the same instance will return the same
- object.
If javaResultType cannot represent all values of type resultType, and a
- reduction kernel produces an unrepresentible value,
- then javaFutureType.get() throws an exception.
devecSiInXType is the Java type corresponding to - the inXType of the corresponding argument of - the accumulator function. Unless inXType is an - unsigned type or a vector type, devecSiInXType is the directly corresponding Java - type. If inXType is an unsigned scalar type, then devecSiInXType is the - Java type directly corresponding to the signed scalar type of the same - size. If inXType is a signed vector type, then devecSiInXType is the Java - type directly corresponding to the vector component type. If inXType is an unsigned - vector type, then devecSiInXType is the Java type directly corresponding to the - signed scalar type of the same size as the vector component type. For example:
-int, then devecSiInXType
- is int.int2, then devecSiInXType
- is int. The array is a flattened representation: It has twice as
- many scalar Elements as the Allocation has 2-component vector
- Elements. This is the same way that the copyFrom() methods of {@link
- android.renderscript.Allocation} work.uint, then deviceSiInXType
- is int. A signed value in the Java array is interpreted as an unsigned value of
- the same bitpattern in the Allocation. This is the same way that the copyFrom()
- methods of {@link android.renderscript.Allocation} work.uint2, then deviceSiInXType
- is int. This is a combination of the way int2 and uint
- are handled: The array is a flattened representation, and Java array signed values are
- interpreted as RenderScript unsigned Element values.Note that for Method 3, input types are handled differently -than result types:
- -ulong).
-#pragma rs reduce(dotProduct) \
- accumulator(dotProductAccum) combiner(dotProductSum)
-
-// Note: No initializer function -- therefore,
-// each accumulator data item is implicitly initialized to 0.0f.
-
-static void dotProductAccum(float *accum, float in1, float in2) {
- *accum += in1*in2;
-}
-
-// combiner function
-static void dotProductSum(float *accum, const float *val) {
- *accum += *val;
-}
-
-
-
-// Find a zero Element in a 2D allocation; return (-1, -1) if none
-#pragma rs reduce(fz2) \
- initializer(fz2Init) \
- accumulator(fz2Accum) combiner(fz2Combine)
-
-static void fz2Init(int2 *accum) { accum->x = accum->y = -1; }
-
-static void fz2Accum(int2 *accum,
- int inVal,
- int x /* special arg */,
- int y /* special arg */) {
- if (inVal==0) {
- accum->x = x;
- accum->y = y;
- }
-}
-
-static void fz2Combine(int2 *accum, const int2 *accum2) {
- if (accum2->x >= 0) *accum = *accum2;
-}
-
-
-
-// Note that this kernel returns an array to Java
-#pragma rs reduce(histogram) \
- accumulator(hsgAccum) combiner(hsgCombine)
-
-#define BUCKETS 256
-typedef uint32_t Histogram[BUCKETS];
-
-// Note: No initializer function --
-// therefore, each bucket is implicitly initialized to 0.
-
-static void hsgAccum(Histogram *h, uchar in) { ++(*h)[in]; }
-
-static void hsgCombine(Histogram *accum,
- const Histogram *addend) {
- for (int i = 0; i < BUCKETS; ++i)
- (*accum)[i] += (*addend)[i];
-}
-
-// Determines the mode (most frequently occurring value), and returns
-// the value and the frequency.
-//
-// If multiple values have the same highest frequency, returns the lowest
-// of those values.
-//
-// Shares functions with the histogram reduction kernel.
-#pragma rs reduce(mode) \
- accumulator(hsgAccum) combiner(hsgCombine) \
- outconverter(modeOutConvert)
-
-static void modeOutConvert(int2 *result, const Histogram *h) {
- uint32_t mode = 0;
- for (int i = 1; i < BUCKETS; ++i)
- if ((*h)[i] > (*h)[mode]) mode = i;
- result->x = mode;
- result->y = (*h)[mode];
-}
-
diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd
index 4d6b4001e0c9e..8278ab19ee611 100644
--- a/docs/html/guide/topics/search/search-dialog.jd
+++ b/docs/html/guide/topics/search/search-dialog.jd
@@ -699,7 +699,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
inflater.inflate(R.menu.options_menu, menu);
// Get the SearchView and set the searchable configuration
- SearchManager searchManager = (SearchManager) {@link android.app.Activity#getSystemService getSystemService}(Context.SEARCH_SERVICE);
+ SearchManager searchManager = (SearchManager) {@link android.app.Activity#getSystemService(java.lang.String) getSystemService()}(Context.SEARCH_SERVICE);
SearchView searchView = (SearchView) menu.findItem(R.id.menu_search).getActionView();
// Assumes current activity is the searchable activity
searchView.setSearchableInfo(searchManager.getSearchableInfo({@link android.app.Activity#getComponentName()}));
diff --git a/docs/html/guide/topics/ui/accessibility/apps.jd b/docs/html/guide/topics/ui/accessibility/apps.jd
index ab8c792cd24b6..c415762693706 100644
--- a/docs/html/guide/topics/ui/accessibility/apps.jd
+++ b/docs/html/guide/topics/ui/accessibility/apps.jd
@@ -298,7 +298,7 @@ then the {@link android.view.View#dispatchPopulateAccessibilityEvent
dispatchPopulateAccessibilityEvent()} method for each child of this view. In order to support
accessibility services on revisions of Android prior to 4.0 (API Level 14) you
must override this method and populate {@link
-android.view.accessibility.AccessibilityEvent#getText} with descriptive text for your custom
+android.view.accessibility.AccessibilityRecord#getText} with descriptive text for your custom
view, which is spoken by accessibility services, such as TalkBack.Note: In Android 4.1 (API Level 16) and higher, the -{@link android.view.accessibility.AccessibilityEvent#getSource getSource()} method, +{@link android.view.accessibility.AccessibilityRecord#getSource getSource()} method, as well as {@link android.view.accessibility.AccessibilityNodeInfo#getChild AccessibilityNodeInfo.getChild()} and {@link android.view.accessibility.AccessibilityNodeInfo#getParent getParent()}, return only @@ -372,7 +372,7 @@ public class MyAccessibilityService extends AccessibilityService { service configuration file. When events are received by your service, it can then retrieve the {@link android.view.accessibility.AccessibilityNodeInfo} object from the event using - {@link android.view.accessibility.AccessibilityEvent#getSource getSource()}. + {@link android.view.accessibility.AccessibilityRecord#getSource getSource()}. With the {@link android.view.accessibility.AccessibilityNodeInfo} object, your service can then explore the view hierarchy to determine what action to take and then act for the user using {@link android.view.accessibility.AccessibilityNodeInfo#performAction performAction()}.
diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd index bf0db576cf2eb..ecdcfdc69ae16 100755 --- a/docs/html/guide/topics/ui/declaring-layout.jd +++ b/docs/html/guide/topics/ui/declaring-layout.jd @@ -423,7 +423,7 @@ ArrayAdapter<String> adapter = new ArrayAdapter<String>(this,Then simply call -{@link android.widget.ListView#setAdapter setAdapter()} on your {@link android.widget.ListView}:
+{@link android.widget.AdapterView#setAdapter setAdapter()} on your {@link android.widget.ListView}:
ListView listView = (ListView) findViewById(R.id.listview);
listView.setAdapter(adapter);
diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd
index 7ab4ca552b4d5..52cd1a03c38e8 100644
--- a/docs/html/guide/topics/ui/dialogs.jd
+++ b/docs/html/guide/topics/ui/dialogs.jd
@@ -643,7 +643,7 @@ android.support.v4.app.Fragment}.
or other {@link android.app.Dialog} objects to build the dialog in this case. If
you want the {@link android.support.v4.app.DialogFragment} to be
embeddable, you must define the dialog's UI in a layout, then load the layout in the
-{@link android.support.v4.app.DialogFragment#onCreateView
+{@link android.support.v4.app.Fragment#onCreateView
onCreateView()} callback.
Here's an example {@link android.support.v4.app.DialogFragment} that can appear as either a
diff --git a/docs/html/guide/topics/ui/layout/gridview.jd b/docs/html/guide/topics/ui/layout/gridview.jd
index 13467ae17245b..4ed6ff55efa31 100644
--- a/docs/html/guide/topics/ui/layout/gridview.jd
+++ b/docs/html/guide/topics/ui/layout/gridview.jd
@@ -81,7 +81,7 @@ public void onCreate(Bundle savedInstanceState) {
After the {@code main.xml} layout is set for the content view, the
{@link android.widget.GridView} is captured from the layout with {@link
android.app.Activity#findViewById(int)}. The {@link
-android.widget.GridView#setAdapter(T) setAdapter()} method then sets a custom adapter ({@code
+android.widget.AdapterView#setAdapter(T) setAdapter()} method then sets a custom adapter ({@code
ImageAdapter}) as the source for all items to be displayed in the grid. The {@code ImageAdapter} is
created in the next step.
To do something when an item in the grid is clicked, the {@link
@@ -170,7 +170,7 @@ the height and width for the View—this ensures that, no matter the size of
image is resized and cropped to fit in these dimensions, as appropriate.
<menu> element in order to create a submenu.
<group>You can add a submenu to an item in any menu (except a submenu) by adding a {@code <menu>} -element as the child of an {@code <item>}. Submenus are useful when your application has a lot +
You can add a submenu to an item in any menu (except a submenu) by adding a {@code