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

Commit 479a49f7 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 7585586c: Merge change Ib1eb2e9e into eclair 

Merge commit '7585586c' into eclair-plus-aosp

* commit '7585586c':
  sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
parents bdcb2b71 7585586c

Android.mk

+18 −20
Original line number Diff line number Diff line
@@ -357,33 +357,31 @@ sample_dir := development/samples 
web_docs_sample_code_flags := \

		-hdf android.hasSamples 1 \

		-samplecode $(sample_dir)/ApiDemos \

		            guide/samples/ApiDemos "API Demos" \

		            resources/samples/ApiDemos "API Demos" \

		-samplecode $(sample_dir)/BluetoothChat \

	                    guide/samples/BluetoothChat "Bluetooth Chat" \

		            resources/samples/BluetoothChat "Bluetooth Chat" \

		-samplecode $(sample_dir)/ContactManager \

	                    guide/samples/ContactManager "Contact Manager" \

		            resources/samples/ContactManager "Contact Manager" \

		-samplecode $(sample_dir)/Home \

		            guide/samples/Home "Home" \

		            resources/samples/Home "Home" \

		-samplecode $(sample_dir)/JetBoy \

		            guide/samples/JetBoy "JetBoy" \

		            resources/samples/JetBoy "JetBoy" \

		-samplecode $(sample_dir)/LunarLander \

		            guide/samples/LunarLander "Lunar Lander" \

		            resources/samples/LunarLander "Lunar Lander" \

		-samplecode $(sample_dir)/MultiResolution \

	                    guide/samples/MultiResolution "Multiple Resolutions" \

		            resources/samples/MultiResolution "Multiple Resolutions" \

		-samplecode $(sample_dir)/NotePad \

		            guide/samples/NotePad "Note Pad" \

		            resources/samples/NotePad "Note Pad" \

		-samplecode $(sample_dir)/SearchableDictionary \

		            guide/samples/SearchableDictionary "Searchable Dictionary" \

		            resources/samples/SearchableDictionary "Searchable Dictionary" \

		-samplecode $(sample_dir)/Snake \

		            guide/samples/Snake "Snake" \

		            resources/samples/Snake "Snake" \

		-samplecode $(sample_dir)/SoftKeyboard \

		            guide/samples/SoftKeyboard "Soft Keyboard" \

		            resources/samples/SoftKeyboard "Soft Keyboard" \

		-samplecode $(sample_dir)/Wiktionary \

	                    guide/samples/Wiktionary "Wiktionary" \

		            resources/samples/Wiktionary "Wiktionary" \

		-samplecode $(sample_dir)/WiktionarySimple \

	                    guide/samples/WiktionarySimple "Wiktionary (Simplified)"





		            resources/samples/WiktionarySimple "Wiktionary (Simplified)"



## SDK version identifiers used in the published docs

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

docs/html/guide/basics/what-is-android.jd

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ to be replaced by the user.</p> 
<p>Underlying all applications is a set of services and systems, including:

<ul>

    <li>A rich and extensible set of <a

    href="{@docRoot}guide/tutorials/views/index.html">Views</a> that can be used to

    href="{@docRoot}resources/tutorials/views/index.html">Views</a> that can be used to

    build an application, including lists, grids, text boxes, buttons, and even

    an embeddable web browser</li>

    <li><a href="{@docRoot}guide/topics/providers/content-providers.html">Content
@@ -80,7 +80,7 @@ to be replaced by the user.</p> 
</ul>



<p>For more details and a walkthrough of an application, see the <a

href="{@docRoot}guide/tutorials/notepad/index.html">Notepad Tutorial</a>.</p>

href="{@docRoot}resources/tutorials/notepad/index.html">Notepad Tutorial</a>.</p>

    

<a name="libraries" id="libraries"></a>

<h2>Libraries</h2>

docs/html/guide/developing/debug-tasks.jd

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ D/ActivityManager( 763): Stopping: HistoryRecord{409dbb20 com.android.home.AllAp 
        that expose useful information such as CPU usage and frame rate. See <a href="#additionaldebugging">Debug

        and Test Settings on the Emulator</a> below. </li>

</ul>

<p>Also, see the <a href="{@docRoot}guide/appendix/faq/troubleshooting.html">Troubleshooting</a> section

<p>Also, see the <a href="{@docRoot}resources/faq/troubleshooting.html">Troubleshooting</a> section

    of the doc to figure out why your application isn't appearing on the emulator,

    or why it's not starting. </p>

docs/html/guide/developing/tools/adt.jd

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ Eclipse components (for example, WST). If you encounter an error when 
installing ADT, your Eclipse installion might not include those components. 

For information about how to quickly add the necessary components to your 

Eclipse installation, see the troubleshooting topic 

<a href="{@docRoot}guide/appendix/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>

<a href="{@docRoot}resources/faq/troubleshooting.html#installeclipsecomponents">ADT Installation Error: "requires plug-in org.eclipse.wst.sse.ui"</a>.</p>



<h4>For Linux users</h4>

<p>If you encounter this error when installing the ADT Plugin for Eclipse:

docs/html/guide/developing/tools/emulator.jd

+1 −1
Original line number Diff line number Diff line
@@ -1754,7 +1754,7 @@ to the current working directory): </p> 
<p>For emulators running on Mac OS X, if you see an error &quot;Warning: No DNS servers found&quot; when starting the emulator, check to see whether you have an <code>/etc/resolv.conf</code> file. If not, please run the following line in a command window:</p>

    <pre>ln -s /private/var/run/resolv.conf /etc/resolv.conf</pre>



<p>See <a href="{@docRoot}guide/appendix/faq/index.html">Frequently Asked Questions</a> for more troubleshooting information. </p>

<p>See <a href="{@docRoot}resources/faq/index.html">Frequently Asked Questions</a> for more troubleshooting information. </p>



<a name="limitations"></a>

    <h2>Emulator Limitations</h2>