Merge "Doc change: adding missing samples" into honeycomb (242d556c) · Commits · e / os / android_frameworks_base

Android.mk

+6 −4

Original line number	Diff line number	Diff line
		@@ -384,10 +384,10 @@ web_docs_sample_code_flags := \
		-hdf android.hasSamples 1 \
		-samplecode $(sample_dir)/AccessibilityService \
		resources/samples/AccessibilityService "Accessibility Service" \
		-samplecode $(sample_dir)/ApiDemos \
		resources/samples/ApiDemos "API Demos" \
		-samplecode $(sample_dir)/AccelerometerPlay \
		resources/samples/AccelerometerPlay "Accelerometer Play" \
		-samplecode $(sample_dir)/ApiDemos \
		resources/samples/ApiDemos "API Demos" \
		-samplecode $(sample_dir)/BackupRestore \
		resources/samples/BackupRestore "Backup and Restore" \
		-samplecode $(sample_dir)/BluetoothChat \
		@@ -397,7 +397,7 @@ web_docs_sample_code_flags := \
		-samplecode $(sample_dir)/ContactManager \
		resources/samples/ContactManager "Contact Manager" \
		-samplecode $(sample_dir)/CubeLiveWallpaper \
		resources/samples/CubeLiveWallpaper "Live Wallpaper" \
		resources/samples/CubeLiveWallpaper "Cube Live Wallpaper" \
		-samplecode $(sample_dir)/Home \
		resources/samples/Home "Home" \
		-samplecode $(sample_dir)/Honeycomb-Gallery \
		@@ -408,6 +408,8 @@ web_docs_sample_code_flags := \
		resources/samples/LunarLander "Lunar Lander" \
		-samplecode $(sample_dir)/MultiResolution \
		resources/samples/MultiResolution "Multiple Resolutions" \
		-samplecode $(sample_dir)/NFCDemo \
		resources/samples/NFCDemo "NFC Demo" \
		-samplecode $(sample_dir)/NotePad \
		resources/samples/NotePad "Note Pad" \
		-samplecode $(sample_dir)/SampleSyncAdapter \

docs/html/resources/resources-data.js

+63 −23

Original line number	Diff line number	Diff line
		@@ -344,6 +344,26 @@ var ANDROID_RESOURCES = [
		/// SAMPLE CODE ///
		///////////////////

		{
		tags: ['sample'],
		path: 'samples/AccelerometerPlay/index.html',
		title: {
		en: 'Accelerometer Play'
		},
		description: {
		en: ''
		}
		},
		{
		tags: ['sample'],
		path: 'samples/AccessibilityService/index.html',
		title: {
		en: 'Accessibility Service'
		},
		description: {
		en: 'Illustrates an accessibility service that provides custom feedback for the Clock application which comes by default with Android devices'
		}
		},
		{
		tags: ['sample', 'layout', 'ui'],
		path: 'samples/ApiDemos/index.html',
		@@ -355,7 +375,7 @@ var ANDROID_RESOURCES = [
		}
		},
		{
		tags: ['sample', 'data', 'newfeature', 'accountsync', 'new'],
		tags: ['sample', 'data', 'newfeature', 'accountsync'],
		path: 'samples/BackupRestore/index.html',
		title: {
		en: 'Backup and Restore'
		@@ -394,6 +414,16 @@ var ANDROID_RESOURCES = [
		en: 'An application that demonstrates how to query the system contacts provider using the <code>ContactsContract</code> API, as well as insert contacts into a specific account.'
		}
		},
		{
		tags: ['sample', 'ui'],
		path: 'samples/CubeLiveWallpaper/index.html',
		title: {
		en: 'Cube Live Wallpaper'
		},
		description: {
		en: 'An application that demonstrates how to create a live wallpaper and bundle it in an application that users can install on their devices.'
		}
		},
		{
		tags: ['sample'],
		path: 'samples/Home/index.html',
		@@ -424,16 +454,6 @@ var ANDROID_RESOURCES = [
		en: 'A game that demonstrates the SONiVOX JET interactive music technology, with <code><a href="/reference/android/media/JetPlayer.html">JetPlayer</a></code>.'
		}
		},
		{
		tags: ['sample', 'ui', 'newfeature'],
		path: 'samples/CubeLiveWallpaper/index.html',
		title: {
		en: 'Live Wallpaper'
		},
		description: {
		en: 'An application that demonstrates how to create a live wallpaper and bundle it in an application that users can install on their devices.'
		}
		},
		{
		tags: ['sample', 'gamedev', 'media'],
		path: 'samples/LunarLander/index.html',
		@@ -454,6 +474,16 @@ var ANDROID_RESOURCES = [
		en: 'A sample application that shows how to use resource directory qualifiers to provide different resources for different screen configurations.'
		}
		},
		{
		tags: ['sample', 'data'],
		path: 'samples/NFCDemo/index.html',
		title: {
		en: 'NFC Demo'
		},
		description: {
		en: 'An application for reading NFC Forum Type 2 Tags using the NFC APIs'
		}
		},
		{
		tags: ['sample', 'data'],
		path: 'samples/NotePad/index.html',
		@@ -484,6 +514,16 @@ var ANDROID_RESOURCES = [
		en: 'A sample application that demonstrates Android\'s search framework, including how to provide search suggestions for Quick Search Box.'
		}
		},
		{
		tags: ['sample'],
		path: 'samples/SipDemo/index.html',
		title: {
		en: 'SIP Demo'
		},
		description: {
		en: 'A demo application highlighting how to make internet-based calls with the SIP API.'
		}
		},
		{
		tags: ['sample', 'layout', 'ui'],
		path: 'samples/Snake/index.html',
		@@ -494,6 +534,16 @@ var ANDROID_RESOURCES = [
		en: 'An implementation of the classic game "Snake."'
		}
		},
		{
		tags: ['sample', 'input'],
		path: 'samples/SoftKeyboard/index.html',
		title: {
		en: 'Soft Keyboard'
		},
		description: {
		en: 'An example of writing an input method for a software keyboard.'
		}
		},
		{
		tags: ['sample', 'testing'],
		path: 'samples/Spinner/index.html',
		@@ -534,16 +584,6 @@ var ANDROID_RESOURCES = [
		en: 'Demonstrates how an application can make use of shared code and resources stored in an Android library project.'
		}
		},
		{
		tags: ['sample', 'input'],
		path: 'samples/SoftKeyboard/index.html',
		title: {
		en: 'Soft Keyboard'
		},
		description: {
		en: 'An example of writing an input method for a software keyboard.'
		}
		},
		{
		tags: ['sample', 'ui'],
		path: 'samples/Wiktionary/index.html',
		@@ -565,7 +605,7 @@ var ANDROID_RESOURCES = [
		}
		},
		{
		tags: ['sample', 'layout', 'new'],
		tags: ['sample', 'layout'],
		path: 'samples/XmlAdapters/index.html',
		title: {
		en: 'XML Adapters'