Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a58f58da authored Feb 17, 2011 by Robert Ly Committed by Android (Google) Code Review Feb 17, 2011

Merge "Doc change: fixing renderscript samples" into honeycomb

parents 0ddd2d1e 6518f486

Android.mk

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -415,6 +415,8 @@ web_docs_sample_code_flags := \
	resources/samples/NotePad "Note Pad" \		resources/samples/NotePad "Note Pad" \
	-samplecode $(sample_dir)/SampleSyncAdapter \		-samplecode $(sample_dir)/SampleSyncAdapter \
	resources/samples/SampleSyncAdapter "Sample Sync Adapter" \		resources/samples/SampleSyncAdapter "Sample Sync Adapter" \
			-samplecode frameworks/base/libs/rs/java \
			resources/samples/Renderscript "Renderscript" \
	-samplecode $(sample_dir)/SearchableDictionary \		-samplecode $(sample_dir)/SearchableDictionary \
	resources/samples/SearchableDictionary "Searchable Dictionary v2" \		resources/samples/SearchableDictionary "Searchable Dictionary v2" \
	-samplecode $(sample_dir)/SipDemo \		-samplecode $(sample_dir)/SipDemo \

docs/html/guide/topics/graphics/renderscript.jd

+80 −76

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/resources/resources-data.js

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -495,6 +495,16 @@ var ANDROID_RESOURCES = [
	en: 'An application for saving notes. Similar (but not identical) to the <a href="/resources/tutorials/notepad/index.html">Notepad tutorial</a>.'		en: 'An application for saving notes. Similar (but not identical) to the <a href="/resources/tutorials/notepad/index.html">Notepad tutorial</a>.'
	}		}
	},		},
			{
			tags: ['sample', 'new'],
			path: 'samples/Renderscript/index.html',
			title: {
			en: 'Renderscript'
			},
			description: {
			en: 'A set of samples that demonstrate how to use various features of the Renderscript APIs.'
			}
			},
	{		{
	tags: ['sample', 'accountsync'],		tags: ['sample', 'accountsync'],
	path: 'samples/SampleSyncAdapter/index.html',		path: 'samples/SampleSyncAdapter/index.html',

libs/rs/java/Balls/_index.html

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			<p>A brute force physics simulation that renders many balls onto the screen and moves them according to user touch and gravity.</p>
			No newline at end of file

libs/rs/java/Fountain/_index.html

0 → 100644

+5 −0

Original line number	Original line	Diff line number	Diff line
			<p>An example that renders many dots on the screen that follow a user's touch. The dots fall
			to the bottom of the screen when the user releases the finger.</p>