diff options
| author | Alexander Lucas <alexlucas@google.com> | 2010-11-03 15:32:57 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-03 15:32:57 -0700 |
| commit | 6f4a084e33c917b7e04309a4296404aef7325fca (patch) | |
| tree | 9ce46863e76dad8033703a25ae05c70dfeb7e665 /docs | |
| parent | 08810efc1a1868261fb042355f75ab049438b6e3 (diff) | |
| parent | a11c9e15064872ad7f56571148a5c61281bfa018 (diff) | |
| download | frameworks_base-6f4a084e33c917b7e04309a4296404aef7325fca.zip frameworks_base-6f4a084e33c917b7e04309a4296404aef7325fca.tar.gz frameworks_base-6f4a084e33c917b7e04309a4296404aef7325fca.tar.bz2 | |
Merge "Added SIP Demo" into gingerbread
Diffstat (limited to 'docs')
| -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 |
3 files changed, 7 insertions, 0 deletions
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> |
