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

Commit f8cd60c9 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'eclair' into eclair-release

parents e0b6a8d9 2624fbca

Android.mk

+13 −3
Original line number Diff line number Diff line
@@ -359,12 +359,16 @@ web_docs_sample_code_flags := \ 
		            guide/samples/ApiDemos "API Demos" \

	        -samplecode $(sample_dir)/BluetoothChat \

	                    guide/samples/BluetoothChat "Bluetooth Chat" \

	        -samplecode $(sample_dir)/ContactManager \

	                    guide/samples/ContactManager "Contact Manager" \

		-samplecode $(sample_dir)/Home \

		            guide/samples/Home "Home" \

		-samplecode $(sample_dir)/JetBoy \

		            guide/samples/JetBoy "JetBoy" \

		-samplecode $(sample_dir)/LunarLander \

		            guide/samples/LunarLander "Lunar Lander" \

	        -samplecode $(sample_dir)/MultiResolution \

	                    guide/samples/MultiResolution "Multiple Resolutions" \

		-samplecode $(sample_dir)/NotePad \

		            guide/samples/NotePad "Note Pad" \

		-samplecode $(sample_dir)/SearchableDictionary \
@@ -372,7 +376,13 @@ web_docs_sample_code_flags := \ 
		-samplecode $(sample_dir)/Snake \

		            guide/samples/Snake "Snake" \

		-samplecode $(sample_dir)/SoftKeyboard \

		            guide/samples/SoftKeyboard "Soft Keyboard"

		            guide/samples/SoftKeyboard "Soft Keyboard" \

	        -samplecode $(sample_dir)/Wiktionary \

	                    guide/samples/Wiktionary "Wiktionary" \

	        -samplecode $(sample_dir)/WiktionarySimple \

	                    guide/samples/WiktionarySimple "Wiktionary (Simplified)"







## SDK version identifiers used in the published docs

  # major[.minor] version for current SDK. (full releases only)

docs/html/guide/guide_toc.cs

+12 −0
Original line number Diff line number Diff line
@@ -401,6 +401,9 @@ 
          <li><a href="<?cs var:toroot ?>guide/samples/BluetoothChat/index.html">

                <span class="en">Bluetooth Chat</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/samples/ContactManager/index.html">

                <span class="en">Contact Manager</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/samples/Home/index.html">

                <span class="en">Home</span>

              </a></li>
@@ -410,6 +413,9 @@ 
          <li><a href="<?cs var:toroot ?>guide/samples/LunarLander/index.html">

                <span class="en">Lunar Lander</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/samples/MultiResolution/index.html">

                <span class="en">Multiple Resolutions</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/samples/NotePad/index.html">

                <span class="en">Note Pad</span>

              </a></li>
@@ -422,6 +428,12 @@ 
          <li><a href="<?cs var:toroot ?>guide/samples/SoftKeyboard/index.html">

                <span class="en">Soft Keyboard</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/samples/Wiktionary/index.html">

                <span class="en">Wiktionary</span>

              </a></li>

          <li><a href="<?cs var:toroot ?>guide/samples/WiktionarySimple/index.html">

                <span class="en">Wiktionary (Simplified)</span>

              </a></li>

        </ul>

      </li>

    </ul>

docs/html/guide/samples/images/ContactManager1.png

−39.6 KiB (13.5 KiB)
Loading image diff...

docs/html/guide/samples/images/ContactManager2.png

−27.8 KiB (11.3 KiB)
Loading image diff...

docs/html/guide/samples/images/MultiResolution.png

0 → 100644
+94.2 KiB
Loading image diff...