diff options
| -rw-r--r-- | Android.mk | 10 | ||||
| -rw-r--r-- | docs/html/resources/resources-data.js | 86 |
2 files changed, 69 insertions, 27 deletions
diff --git a/Android.mk b/Android.mk index 61d74ad3e9f7..7728b0210c74 100644 --- a/Android.mk +++ b/Android.mk @@ -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 \ @@ -396,8 +396,8 @@ web_docs_sample_code_flags := \ resources/samples/BusinessCard "Business Card" \ -samplecode $(sample_dir)/ContactManager \ resources/samples/ContactManager "Contact Manager" \ - -samplecode $(sample_dir)/CubeLiveWallpaper \ - resources/samples/CubeLiveWallpaper "Live Wallpaper" \ + -samplecode $(sample_dir)/CubeLiveWallpaper \ + 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 \ diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js index 233838b121b0..11964da3f537 100644 --- a/docs/html/resources/resources-data.js +++ b/docs/html/resources/resources-data.js @@ -343,7 +343,27 @@ 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' @@ -395,6 +415,16 @@ var ANDROID_RESOURCES = [ } }, { + 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', title: { @@ -425,16 +455,6 @@ var ANDROID_RESOURCES = [ } }, { - 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', title: { @@ -456,6 +476,16 @@ var ANDROID_RESOURCES = [ }, { 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', title: { en: 'Note Pad' @@ -485,6 +515,16 @@ var ANDROID_RESOURCES = [ } }, { + 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', title: { @@ -495,6 +535,16 @@ var ANDROID_RESOURCES = [ } }, { + 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', title: { @@ -535,16 +585,6 @@ var ANDROID_RESOURCES = [ } }, { - 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', title: { @@ -565,7 +605,7 @@ var ANDROID_RESOURCES = [ } }, { - tags: ['sample', 'layout', 'new'], + tags: ['sample', 'layout'], path: 'samples/XmlAdapters/index.html', title: { en: 'XML Adapters' |