diff options
| author | Alexander Lucas <alexlucas@google.com> | 2010-11-03 15:35:29 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-03 15:35:29 -0700 |
| commit | f0452c250757f560205da19b02a9172e5d98a71c (patch) | |
| tree | 463727ceece54c9e8eb261272c2c350b169c7339 | |
| parent | d9bb6bc283b3f7ee75da14c42c8a563214103c05 (diff) | |
| parent | 6f4a084e33c917b7e04309a4296404aef7325fca (diff) | |
| download | frameworks_base-f0452c250757f560205da19b02a9172e5d98a71c.zip frameworks_base-f0452c250757f560205da19b02a9172e5d98a71c.tar.gz frameworks_base-f0452c250757f560205da19b02a9172e5d98a71c.tar.bz2 | |
am 6f4a084e: Merge "Added SIP Demo" into gingerbread
* commit '6f4a084e33c917b7e04309a4296404aef7325fca':
Added SIP Demo
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | docs/html/resources/resources_toc.cs | 3 | ||||
| -rwxr-xr-x | docs/html/resources/samples/images/SipDemo.png | bin | 0 -> 72267 bytes | |||
| -rw-r--r-- | docs/html/resources/samples/index.jd | 4 |
4 files changed, 9 insertions, 0 deletions
@@ -416,6 +416,8 @@ web_docs_sample_code_flags := \ resources/samples/SampleSyncAdapter "Sample Sync Adapter" \ -samplecode $(sample_dir)/SearchableDictionary \ resources/samples/SearchableDictionary "Searchable Dictionary v2" \ + -samplecode $(sample_dir)/SipDemo \ + resources/samples/SipDemo "SIP Demo" \ -samplecode $(sample_dir)/Snake \ resources/samples/Snake "Snake" \ -samplecode $(sample_dir)/SoftKeyboard \ diff --git a/docs/html/resources/resources_toc.cs b/docs/html/resources/resources_toc.cs index 628287d..735a00e 100644 --- a/docs/html/resources/resources_toc.cs +++ b/docs/html/resources/resources_toc.cs @@ -236,6 +236,9 @@ <li><a href="<?cs var:toroot ?>resources/samples/SearchableDictionary/index.html"> <span class="en">Searchable Dictionary v2</span> </a> <span class="new">new!</span></li> + <li><a href="<?cs var:toroot ?>resources/samples/SipDemo/index.html"> + <span class="en">SIP Demo</span> + </a> <span class="new">new!</span></li> <li><a href="<?cs var:toroot ?>resources/samples/Snake/index.html"> <span class="en">Snake</span> </a></li> diff --git a/docs/html/resources/samples/images/SipDemo.png b/docs/html/resources/samples/images/SipDemo.png Binary files differnew file mode 100755 index 0000000..999bea9 --- /dev/null +++ b/docs/html/resources/samples/images/SipDemo.png diff --git a/docs/html/resources/samples/index.jd b/docs/html/resources/samples/index.jd index 9fc8e0b..cbe6ca3 100644 --- a/docs/html/resources/samples/index.jd +++ b/docs/html/resources/samples/index.jd @@ -73,6 +73,10 @@ adapter).</dd> <dd>A sample application that demonstrates Android's search framework, including how to provide search suggestions for Quick Search Box.</dd> + <dt><a href="SipDemo/index.html">SIP Demo</a></dt> + <dd>An application that demonstrates how to make an internet-based call using the SIP + API.</dd> + <dt><a href="Snake/index.html">Snake</a></dt> <dd>An implementation of the classic game "Snake."</dd> |
