diff options
Diffstat (limited to 'docs/html/guide/topics')
| -rw-r--r-- | docs/html/guide/topics/manifest/activity-element.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/renderscript/compute.jd | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index bd1edc2..b648d48 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -580,7 +580,7 @@ This attribute was introduced in API Level 3. <a href="#nm"><code>android:name</code></a> attribute. <p>The system reads this attribute to determine which activity should be started when - the use presses the Up button in the action bar. The system can also use this information to + the user presses the Up button in the action bar. The system can also use this information to synthesize a back stack of activities with {@link android.app.TaskStackBuilder}.</p> <p>To support API levels 4 - 16, you can also declare the parent activity with a {@code diff --git a/docs/html/guide/topics/renderscript/compute.jd b/docs/html/guide/topics/renderscript/compute.jd index c62510b..297a2dc 100644 --- a/docs/html/guide/topics/renderscript/compute.jd +++ b/docs/html/guide/topics/renderscript/compute.jd @@ -56,7 +56,9 @@ contain:</p> RenderScript kernel language used in this script. Currently, 1 is the only valid value.</li> <li>A pragma declaration (<code>#pragma rs java_package_name(com.example.app)</code>) that -declares the package name of the Java classes reflected from this script.</li> +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 +library project.</li> <li>Some number of invokable functions. An invokable function is a single-threaded RenderScript function that you can call from your Java code with arbitrary arguments. These are often useful for @@ -308,4 +310,4 @@ function launches as necessary.</li> <li><strong>Tear down the RenderScript context.</strong> The RenderScript context can be destroyed with {@link android.renderscript.RenderScript#destroy} or by allowing the RenderScript context object to be garbage collected. This will cause any further use of any object belonging to that -context to throw an exception.</li> </ol>
\ No newline at end of file +context to throw an exception.</li> </ol> |