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

Commit 15d18efd authored by Jason Chen's avatar Jason Chen
Browse files

resolved conflicts for merge of f0452c25 to master 

Change-Id: Ie8f5e81393ac965fd570f99239ab8be8ea0db00c
parents ce4b523e f0452c25

Android.mk

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

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 Original line Diff line number Diff line
@@ -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>

docs/html/resources/resources_toc.cs

+1 −1

File changed.

Contains only whitespace changes.