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

Commit 0ab047c7 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 769612e1: am b32c2402: Doc change: add toc references to tictactoe sample apps and screen shots. 

Merge commit '769612e1' into kraken

* commit '769612e1':
  Doc change: add toc references to tictactoe sample apps and screen shots.
parents 99dcfe7c 769612e1

Android.mk

+4 −0
Original line number Diff line number Diff line
@@ -415,6 +415,10 @@ web_docs_sample_code_flags := \ 
		            resources/samples/Spinner "Spinner" \

		-samplecode $(sample_dir)/SpinnerTest \

		            resources/samples/SpinnerTest "SpinnerTest" \

		-samplecode $(sample_dir)/TicTacToeLib  \

		            resources/samples/TicTacToeLib "TicTacToeLib" \

		-samplecode $(sample_dir)/TicTacToeMain \

		            resources/samples/TicTacToeMain "TicTacToeMain" \

		-samplecode $(sample_dir)/Wiktionary \

		            resources/samples/Wiktionary "Wiktionary" \

		-samplecode $(sample_dir)/WiktionarySimple \

docs/html/resources/resources_toc.cs

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

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

                </a> <span class="new">new!</span></li>

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

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

                </a> <span class="new">new!</span></li>

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

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

                </a> <span class="new">new!</span></li>

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

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

              </a></li>

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

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

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

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

docs/html/resources/samples/index.jd

+16 −0
Original line number Diff line number Diff line
@@ -92,6 +92,22 @@ adapter).</dd> 
    please read the 

    <a href="{@docRoot}resources/tutorials/testing/activity_test.html">Activity Testing</a> tutorial.

 </dd>

 <dt><a href="TicTacToeLib/index.html">TicTacToeLib</a></dt>

 <dd>

    An example of an Android library project that provides a game-play

    Activity to any dependent application project. For an example of

    how an application can use the code and resources in an Android

    library project, see the <a

    href="{@docRoot}resources/samples/TicTacToeMain/index.html">TicTacToeMain</a>

    sample application.

 </dd>

 <dt><a href="TicTacToeMain/index.html">TicTacToeMain</a></dt>

 <dd>

    An example of an Android application that makes use of code and

    resources provided in an Android library project. Specifically, this

    application uses code and resources provided in the <a

    href="{@docRoot}resources/samples/TicTacToeLib/index.html">TicTacToeLib</a> library project.

 </dd>

 <dt><a href="Wiktionary/index.html">Wiktionary</a></dt>

  <dd>An example of creating interactive widgets for display on the Android

  home screen.</dd>