drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6f4a084e: Merge "Added SIP Demo" into gingerbread

Browse Source 
* commit '6f4a084e33c917b7e04309a4296404aef7325fca':
  Added SIP Demo
This commit is contained in:
Alexander Lucas
2010-11-03 15:35:29 -07:00
committed by Android Git Automerger
parent d9bb6bc283 6f4a084e33
commit f0452c2507
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@ -416,6 +416,8 @@ web_docs_sample_code_flags := \
resources/samples/SampleSyncAdapter "Sample Sync Adapter" \ resources/samples/SampleSyncAdapter "Sample Sync Adapter" \
-samplecode $(sample_dir)/SearchableDictionary \ -samplecode $(sample_dir)/SearchableDictionary \
resources/samples/SearchableDictionary "Searchable Dictionary v2" \ resources/samples/SearchableDictionary "Searchable Dictionary v2" \
-samplecode $(sample_dir)/SipDemo \
resources/samples/SipDemo "SIP Demo" \
-samplecode $(sample_dir)/Snake \ -samplecode $(sample_dir)/Snake \
resources/samples/Snake "Snake" \ resources/samples/Snake "Snake" \
-samplecode $(sample_dir)/SoftKeyboard \ -samplecode $(sample_dir)/SoftKeyboard \

3
docs/html/resources/resources_toc.cs
View File

@ -236,6 +236,9 @@
<li><a href="<?cs var:toroot ?>resources/samples/SearchableDictionary/index.html"> <li><a href="<?cs var:toroot ?>resources/samples/SearchableDictionary/index.html">
<span class="en">Searchable Dictionary v2</span> <span class="en">Searchable Dictionary v2</span>
</a> <span class="new">new!</span></li> </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"> <li><a href="<?cs var:toroot ?>resources/samples/Snake/index.html">
<span class="en">Snake</span> <span class="en">Snake</span>
</a></li> </a></li>

BIN
docs/html/resources/samples/images/SipDemo.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 71 KiB

4
docs/html/resources/samples/index.jd
View File

@ -73,6 +73,10 @@ adapter).</dd>
<dd>A sample application that demonstrates Android's search framework, <dd>A sample application that demonstrates Android's search framework,
including how to provide search suggestions for Quick Search Box.</dd> 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> <dt><a href="Snake/index.html">Snake</a></dt>
<dd>An implementation of the classic game "Snake."</dd> <dd>An implementation of the classic game "Snake."</dd>