summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Fred Chung <fchung@google.com> 2011-11-28 16:44:13 -0800
committer Fred Chung <fchung@google.com> 2011-11-28 16:44:13 -0800
commit8e076fe774386762da21d78823f905751f2803d9 (patch)
treec0beacb5b7f8bca1405b5d577f76fd5f4a211c72
parentfe464a76d8fc858be971dbb5e67b1d22fd925347 (diff)
Documentation for the VPN sample for ICS SDK.
Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html Change-Id: I35a17374fc0d9d165cedc9d6e1052eaec0028ace
-rw-r--r--Android.mk2
-rw-r--r--docs/html/resources/resources-data.js10
-rwxr-xr-xdocs/html/resources/samples/images/vpn-confirmation.pngbin0 -> 60214 bytes
3 files changed, 12 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index a748b7b3f30a..85a4a7cf2072 100644
--- a/Android.mk
+++ b/Android.mk
@@ -462,6 +462,8 @@ web_docs_sample_code_flags := \
resources/samples/TicTacToeLib "TicTacToeLib" \
-samplecode $(sample_dir)/TicTacToeMain \
resources/samples/TicTacToeMain "TicTacToeMain" \
+ -samplecode $(sample_dir)/ToyVpn \
+ resources/samples/ToyVpn "Toy VPN Client" \
-samplecode $(sample_dir)/USB \
resources/samples/USB "USB" \
-samplecode $(sample_dir)/WeatherListWidget \
diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js
index a35e6848f1b9..18f1547d0ed9 100644
--- a/docs/html/resources/resources-data.js
+++ b/docs/html/resources/resources-data.js
@@ -718,6 +718,16 @@ var ANDROID_RESOURCES = [
}
},
{
+ tags: ['sample', 'communication', 'new'],
+ path: 'samples/ToyVpn/index.html',
+ title: {
+ en: 'Toy VPN Client'
+ },
+ description: {
+ en: 'A sample application that illustrates the creation of a custom VPN client.'
+ }
+ },
+ {
tags: ['sample', 'newfeature'],
path: 'samples/USB/index.html',
title: {
diff --git a/docs/html/resources/samples/images/vpn-confirmation.png b/docs/html/resources/samples/images/vpn-confirmation.png
new file mode 100755
index 000000000000..ae2e58332089
--- /dev/null
+++ b/docs/html/resources/samples/images/vpn-confirmation.png
Binary files differ