diff options
| -rw-r--r-- | Android.mk | 12 | ||||
| -rw-r--r-- | docs/html/guide/guide_toc.cs | 15 | ||||
| -rw-r--r-- | docs/html/guide/samples/images/HomeSample.png | bin | 0 -> 44416 bytes | |||
| -rw-r--r-- | docs/html/guide/samples/images/JetBoy.png | bin | 0 -> 53801 bytes | |||
| -rw-r--r-- | docs/html/guide/samples/images/Snake.png | bin | 0 -> 5445 bytes | |||
| -rw-r--r-- | docs/html/guide/samples/images/SoftKeyboard.png | bin | 0 -> 13426 bytes | |||
| -rw-r--r-- | docs/html/guide/samples/images/sample_lunarlander.png | bin | 0 -> 27514 bytes | |||
| -rw-r--r-- | docs/html/guide/samples/images/sample_note.png | bin | 0 -> 6011 bytes | |||
| -rw-r--r-- | docs/html/guide/samples/images/sample_notepad.png | bin | 0 -> 6530 bytes | |||
| -rw-r--r-- | docs/html/guide/samples/index.jd | 19 |
10 files changed, 42 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index 09cffe29fd3d..3653c7b962c8 100644 --- a/Android.mk +++ b/Android.mk @@ -337,7 +337,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ -since ./frameworks/base/api/1.xml 1 \ -since ./frameworks/base/api/2.xml 2 \ -since ./frameworks/base/api/3.xml 3 \ - -since ./frameworks/base/api/current.xml Donut \ + -since ./frameworks/base/api/4.xml 4 \ -error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \ -overview $(LOCAL_PATH)/core/java/overview.html @@ -349,10 +349,18 @@ web_docs_sample_code_flags := \ -hdf android.hasSamples 1 \ -samplecode $(sample_dir)/ApiDemos \ guide/samples/ApiDemos "API Demos" \ + -samplecode $(sample_dir)/Home \ + guide/samples/Home "Home" \ + -samplecode $(sample_dir)/JetBoy \ + guide/samples/JetBoy "JetBoy" \ -samplecode $(sample_dir)/LunarLander \ guide/samples/LunarLander "Lunar Lander" \ -samplecode $(sample_dir)/NotePad \ - guide/samples/NotePad "Note Pad" + guide/samples/NotePad "Note Pad" \ + -samplecode $(sample_dir)/Snake \ + guide/samples/Snake "Snake" \ + -samplecode $(sample_dir)/SoftKeyboard \ + guide/samples/SoftKeyboard "Soft Keyboard" ## SDK version identifiers used in the published docs # major[.minor] version for current SDK. (full releases only) diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index 0b3373952feb..459ad37f79b6 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -387,17 +387,30 @@ <li><a href="<?cs var:toroot ?>guide/samples/ApiDemos/index.html"> <span class="en">API Demos</span> </a></li> + <li><a href="<?cs var:toroot ?>guide/samples/Home/index.html"> + <span class="en">Home</span> + </a></li> + <li><a href="<?cs var:toroot ?>guide/samples/JetBoy/index.html"> + <span class="en">JetBoy</span> + </a></li> <li><a href="<?cs var:toroot ?>guide/samples/LunarLander/index.html"> <span class="en">Lunar Lander</span> </a></li> <li><a href="<?cs var:toroot ?>guide/samples/NotePad/index.html"> - <span class="en">NotePad</span> + <span class="en">Note Pad</span> + </a></li> + <li><a href="<?cs var:toroot ?>guide/samples/Snake/index.html"> + <span class="en">Snake</span> + </a></li> + <li><a href="<?cs var:toroot ?>guide/samples/SoftKeyboard/index.html"> + <span class="en">Soft Keyboard</span> </a></li> </ul> </li> <?cs /if ?> </ul> </li> + <li> <h2><span class="en">Appendix</span> diff --git a/docs/html/guide/samples/images/HomeSample.png b/docs/html/guide/samples/images/HomeSample.png Binary files differnew file mode 100644 index 000000000000..990bebbdb485 --- /dev/null +++ b/docs/html/guide/samples/images/HomeSample.png diff --git a/docs/html/guide/samples/images/JetBoy.png b/docs/html/guide/samples/images/JetBoy.png Binary files differnew file mode 100644 index 000000000000..3da044827d7a --- /dev/null +++ b/docs/html/guide/samples/images/JetBoy.png diff --git a/docs/html/guide/samples/images/Snake.png b/docs/html/guide/samples/images/Snake.png Binary files differnew file mode 100644 index 000000000000..c5211d8835dd --- /dev/null +++ b/docs/html/guide/samples/images/Snake.png diff --git a/docs/html/guide/samples/images/SoftKeyboard.png b/docs/html/guide/samples/images/SoftKeyboard.png Binary files differnew file mode 100644 index 000000000000..8a4ec6322cc8 --- /dev/null +++ b/docs/html/guide/samples/images/SoftKeyboard.png diff --git a/docs/html/guide/samples/images/sample_lunarlander.png b/docs/html/guide/samples/images/sample_lunarlander.png Binary files differnew file mode 100644 index 000000000000..a2ff75ab6467 --- /dev/null +++ b/docs/html/guide/samples/images/sample_lunarlander.png diff --git a/docs/html/guide/samples/images/sample_note.png b/docs/html/guide/samples/images/sample_note.png Binary files differnew file mode 100644 index 000000000000..8fc9dcc0e627 --- /dev/null +++ b/docs/html/guide/samples/images/sample_note.png diff --git a/docs/html/guide/samples/images/sample_notepad.png b/docs/html/guide/samples/images/sample_notepad.png Binary files differnew file mode 100644 index 000000000000..46f221104b20 --- /dev/null +++ b/docs/html/guide/samples/images/sample_notepad.png diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd index 365284d45bab..d8bbc4128c54 100644 --- a/docs/html/guide/samples/index.jd +++ b/docs/html/guide/samples/index.jd @@ -15,11 +15,28 @@ in the SDK. You can find the sample applications for each platform version in th <p>You can easily add these applications as projects in your development environment, so that you can modify them and watch them execute. </p> <dl> + <dt><a href="ApiDemos/index.html">API Demos</a></dt> - <dd>A variety of small applications that demonstrate simple views and widgets.</dd> + <dd>A variety of small applications that demonstrate an extensive collection of framework topics.</dd> + + <dt><a href="Home/index.html">Home</a></dt> + <dd>An application for saving notes. Similar (but not identical) to the + <a href="{@docRoot}guide/tutorials/notepad/index.html">Notepad tutorial</a>.</dd> + + <dt><a href="JetBoy/index.html">JetBoy</a></dt> + <dd>JetBoy is a game that demonstrates the SONiVOX JET interactive music technology, with {@link android.media.JetPlayer}.</dd> + <dt><a href="LunarLander/index.html">Lunar Lander</a></dt> <dd>A classic Lunar Lander game.</dd> + <dt><a href="NotePad/index.html">Note Pad</a></dt> <dd>An application for saving notes. Similar (but not identical) to the <a href="{@docRoot}guide/tutorials/notepad/index.html">Notepad tutorial</a>.</dd> + + <dt><a href="Snake/index.html">Snake</a></dt> + <dd>An implementation of the classic game "Snake."</dd> + + <dt><a href="SoftKeyboard/index.html">Soft Keyboard</a></dt> + <dd>An example of writing an input method for a software keyboard.</dd> + </dl> |
