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

Commit e120cfd4 authored by Scott Main's avatar Scott Main Committed by Android Git Automerger
Browse files

am b385508d: Add more code samples to the online docs. Add build rules to... 

am b385508d: Add more code samples to the online docs. Add build rules to include the development samples in the droiddoc build process. Add all the sample screenshots to a new samples/images/ directory Revise the samples homepage to include links to new samples

Merge commit 'b385508d' into eclair

* commit 'b385508d':
  Add more code samples to the online docs.
parents 5e6ad478 b385508d

Android.mk

+10 −2
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ framework_docs_LOCAL_DROIDDOC_OPTIONS := \ 
    -since ./frameworks/base/api/1.xml 1 \

    -since ./frameworks/base/api/2.xml 2 \

    -since ./frameworks/base/api/3.xml 3 \

    -since ./frameworks/base/api/current.xml Donut \

    -since ./frameworks/base/api/4.xml 4 \

		-error 1 -error 2 -warning 3 -error 4 -error 6 -error 8 \

		-overview $(LOCAL_PATH)/core/java/overview.html
@@ -349,10 +349,18 @@ web_docs_sample_code_flags := \ 
		-hdf android.hasSamples 1 \

		-samplecode $(sample_dir)/ApiDemos \

		            guide/samples/ApiDemos "API Demos" \

		-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)/NotePad \

		            guide/samples/NotePad "Note Pad"

		            guide/samples/NotePad "Note Pad" \

		-samplecode $(sample_dir)/Snake \

		            guide/samples/Snake "Snake" \

		-samplecode $(sample_dir)/SoftKeyboard \

		            guide/samples/SoftKeyboard "Soft Keyboard"



## SDK version identifiers used in the published docs

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

docs/html/guide/guide_toc.cs

+14 −1
Original line number Diff line number Diff line
@@ -387,18 +387,31 @@ 
          <li><a href="<?cs var:toroot ?>guide/samples/ApiDemos/index.html">

                <span class="en">API Demos</span>

              </a></li>

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

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

              </a></li>

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

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

              </a></li>

          <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/NotePad/index.html">

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

              </a></li>

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

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

              </a></li>

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

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

              </a></li>

        </ul>

      </li>

    <?cs /if ?>

    </ul>

  </li>

  



  <li>

    <h2><span class="en">Appendix</span>

               <span class="de">Anhang</span>

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

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

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

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

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

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