Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f4a084e authored by Alexander Lucas's avatar Alexander Lucas Committed by Android (Google) Code Review
Browse files

Merge "Added SIP Demo" into gingerbread

parents 08810efc a11c9e15

Android.mk

+2 −0
Original line number Diff line number Diff line
@@ -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 \

docs/html/resources/resources_toc.cs

+3 −0
Original line number Diff line number Diff line
@@ -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>

docs/html/resources/samples/images/SipDemo.png

0 → 100755
+70.6 KiB
Loading image diff...

docs/html/resources/samples/index.jd

+4 −0
Original line number Diff line number Diff line
@@ -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>