From 0e71bdc6acd581d653062dd15a9b772eaee10231 Mon Sep 17 00:00:00 2001
From: Roman Nurik
Date: Thu, 10 Dec 2009 09:42:51 -0800
Subject: Add ContactManager, MultiResolution, Wiktionary, and WiktionarySimple
to samples index. Also add latest samples zip file.
---
Android.mk | 16 ++++++++++---
docs/html/guide/guide_toc.cs | 12 ++++++++++
docs/html/guide/samples/images/ContactManager1.png | Bin 54351 -> 13809 bytes
docs/html/guide/samples/images/ContactManager2.png | Bin 40027 -> 11581 bytes
docs/html/guide/samples/images/MultiResolution.png | Bin 0 -> 96462 bytes
docs/html/guide/samples/images/Wiktionary.png | Bin 0 -> 23644 bytes
.../html/guide/samples/images/WiktionarySimple.png | Bin 0 -> 61543 bytes
docs/html/guide/samples/images/wiktionary.png | Bin 228217 -> 0 bytes
.../guide/samples/images/wiktionary_detail.png | Bin 76521 -> 0 bytes
docs/html/guide/samples/index.jd | 25 +++++++++++++++++++--
docs/html/shareables/latest_samples.zip | Bin 0 -> 6874369 bytes
11 files changed, 48 insertions(+), 5 deletions(-)
create mode 100644 docs/html/guide/samples/images/MultiResolution.png
create mode 100644 docs/html/guide/samples/images/Wiktionary.png
create mode 100644 docs/html/guide/samples/images/WiktionarySimple.png
delete mode 100644 docs/html/guide/samples/images/wiktionary.png
delete mode 100644 docs/html/guide/samples/images/wiktionary_detail.png
create mode 100644 docs/html/shareables/latest_samples.zip
diff --git a/Android.mk b/Android.mk
index cd4e58ebe148..8a3c5bf968b9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -357,14 +357,18 @@ web_docs_sample_code_flags := \
-hdf android.hasSamples 1 \
-samplecode $(sample_dir)/ApiDemos \
guide/samples/ApiDemos "API Demos" \
- -samplecode $(sample_dir)/BluetoothChat \
- guide/samples/BluetoothChat "Bluetooth Chat" \
+ -samplecode $(sample_dir)/BluetoothChat \
+ guide/samples/BluetoothChat "Bluetooth Chat" \
+ -samplecode $(sample_dir)/ContactManager \
+ guide/samples/ContactManager "Contact Manager" \
-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)/MultiResolution \
+ guide/samples/MultiResolution "Multiple Resolutions" \
-samplecode $(sample_dir)/NotePad \
guide/samples/NotePad "Note Pad" \
-samplecode $(sample_dir)/SearchableDictionary \
@@ -372,7 +376,13 @@ web_docs_sample_code_flags := \
-samplecode $(sample_dir)/Snake \
guide/samples/Snake "Snake" \
-samplecode $(sample_dir)/SoftKeyboard \
- guide/samples/SoftKeyboard "Soft Keyboard"
+ guide/samples/SoftKeyboard "Soft Keyboard" \
+ -samplecode $(sample_dir)/Wiktionary \
+ guide/samples/Wiktionary "Wiktionary" \
+ -samplecode $(sample_dir)/WiktionarySimple \
+ guide/samples/WiktionarySimple "Wiktionary (Simplified)"
+
+
## 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 6c6e0e76793e..c08a280af1cf 100644
--- a/docs/html/guide/guide_toc.cs
+++ b/docs/html/guide/guide_toc.cs
@@ -401,6 +401,9 @@
Bluetooth Chat
+
+ Contact Manager
+
Home
@@ -410,6 +413,9 @@
Lunar Lander
+
+ Multiple Resolutions
+
Note Pad
@@ -422,6 +428,12 @@
Soft Keyboard
+
+ Wiktionary
+
+
+ Wiktionary (Simplified)
+
diff --git a/docs/html/guide/samples/images/ContactManager1.png b/docs/html/guide/samples/images/ContactManager1.png
index 5bfd27b93417..78f09d2ff070 100644
Binary files a/docs/html/guide/samples/images/ContactManager1.png and b/docs/html/guide/samples/images/ContactManager1.png differ
diff --git a/docs/html/guide/samples/images/ContactManager2.png b/docs/html/guide/samples/images/ContactManager2.png
index 0a11ec373084..34da37db063d 100644
Binary files a/docs/html/guide/samples/images/ContactManager2.png and b/docs/html/guide/samples/images/ContactManager2.png differ
diff --git a/docs/html/guide/samples/images/MultiResolution.png b/docs/html/guide/samples/images/MultiResolution.png
new file mode 100644
index 000000000000..8b245d99532a
Binary files /dev/null and b/docs/html/guide/samples/images/MultiResolution.png differ
diff --git a/docs/html/guide/samples/images/Wiktionary.png b/docs/html/guide/samples/images/Wiktionary.png
new file mode 100644
index 000000000000..eae5da5bdd10
Binary files /dev/null and b/docs/html/guide/samples/images/Wiktionary.png differ
diff --git a/docs/html/guide/samples/images/WiktionarySimple.png b/docs/html/guide/samples/images/WiktionarySimple.png
new file mode 100644
index 000000000000..a23226b8b02e
Binary files /dev/null and b/docs/html/guide/samples/images/WiktionarySimple.png differ
diff --git a/docs/html/guide/samples/images/wiktionary.png b/docs/html/guide/samples/images/wiktionary.png
deleted file mode 100644
index b750076820a7..000000000000
Binary files a/docs/html/guide/samples/images/wiktionary.png and /dev/null differ
diff --git a/docs/html/guide/samples/images/wiktionary_detail.png b/docs/html/guide/samples/images/wiktionary_detail.png
deleted file mode 100644
index 1a4dfe65d126..000000000000
Binary files a/docs/html/guide/samples/images/wiktionary_detail.png and /dev/null differ
diff --git a/docs/html/guide/samples/index.jd b/docs/html/guide/samples/index.jd
index 4fca8dac84c3..28f3d0895884 100644
--- a/docs/html/guide/samples/index.jd
+++ b/docs/html/guide/samples/index.jd
@@ -28,6 +28,13 @@ android update project -s -n API Demos -t <target_ID> -p <pat
The pages below provide an overview of each sample application (available with most
platforms) and allow you to view the source files in your browser.
+
+
Some of the samples in this listing are not yet available in the
+ SDK. While we work to update the SDK, you can
+ download the latest samples as a ZIP
+ file here.
+
+
- API Demos
@@ -36,10 +43,13 @@ platforms) and allow you to view the source files in your browser.
Bluetooth Chat
An application for two-way text messaging over Bluetooth.
+
+ Contact Manager
+ An application that demonstrates how to query the system contacts provider, as
+ well as insert contacts into a specific account.
Home
- An application for saving notes. Similar (but not identical) to the
- Notepad tutorial.
+ A home screen replacement application.
JetBoy
JetBoy is a game that demonstrates the SONiVOX JET interactive music technology,
@@ -47,6 +57,10 @@ platforms) and allow you to view the source files in your browser.
Lunar Lander
A classic Lunar Lander game.
+
+ Multiple Resolutions
+ A sample application that shows how to use resource directory qualifiers to
+ provide different resources for different screen configurations.
Note Pad
An application for saving notes. Similar (but not identical) to the
@@ -61,6 +75,13 @@ platforms) and allow you to view the source files in your browser.
Soft Keyboard
An example of writing an input method for a software keyboard.
+
+ Wiktionary
+ An example of creating interactive widgets for display on the Android
+ home screen.
+
+ Wiktionary (Simplified)
+ A simple Android home screen widgets example.
diff --git a/docs/html/shareables/latest_samples.zip b/docs/html/shareables/latest_samples.zip
new file mode 100644
index 000000000000..585d6f2f3f40
Binary files /dev/null and b/docs/html/shareables/latest_samples.zip differ
--
cgit v1.2.3-59-g8ed1b