am dfbad7d3: am 125204b7: am 1c8b6ca4: docs: fix misc broken links (838fd9c4) · Commits · e / os / android_frameworks_base

docs/html/guide/developing/eclipse-adt.jd

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -527,7 +527,7 @@ Marking a project as an Android library project. </p>
	<p>A library project's manifest file must declare all of the shared components		<p>A library project's manifest file must declare all of the shared components
	that it includes, just as would a standard Android application. For more		that it includes, just as would a standard Android application. For more
	information, see the documentation for <a		information, see the documentation for <a
	href="{@docRoot}guide/manifest/manifest-intro.html">AndroidManifest.xml</a>.</p>		href="{@docRoot}guide/topics/manifest/manifest-intro.html">AndroidManifest.xml</a>.</p>

	<p>For example, the <a		<p>For example, the <a
	href="{@docRoot}resources/samples/TicTacToeLib/AndroidManifest.html">TicTacToeLib</a>		href="{@docRoot}resources/samples/TicTacToeLib/AndroidManifest.html">TicTacToeLib</a>
	@@ -613,7 +613,8 @@ like this: </p>
	...		...
	</manifest></pre>		</manifest></pre>

	<p>For more information about the manifest file, see the documentation for <a href="{@docRoot}guide/manifest/manifest-intro.html">AndroidManifest.xml</a>.</p>		<p>For more information about the manifest file, see the documentation for <a
			href="{@docRoot}guide/topics/manifest/manifest-intro.html">AndroidManifest.xml</a>.</p>


	<h3 id="considerations">Development considerations</h3>		<h3 id="considerations">Development considerations</h3>

docs/html/guide/developing/other-ide.jd

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -687,7 +687,7 @@ so that other applications can use it, you can do so by adding a the
	<p>A library project's manifest file must declare all of the shared components		<p>A library project's manifest file must declare all of the shared components
	that it includes, just as would a standard Android application. For more		that it includes, just as would a standard Android application. For more
	information, see the documentation for <a		information, see the documentation for <a
	href="{@docRoot}guide/manifest/manifest-intro.html">AndroidManifest.xml</a>.</p>		href="{@docRoot}guide/topics/manifest/manifest-intro.html">AndroidManifest.xml</a>.</p>

	<p>For example, the <a		<p>For example, the <a
	href="{@docRoot}resources/samples/TicTacToeLib/AndroidManifest.html">TicTacToeLib</a>		href="{@docRoot}resources/samples/TicTacToeLib/AndroidManifest.html">TicTacToeLib</a>
	@@ -799,7 +799,8 @@ like this: </p>
	...		...
	</manifest></pre>		</manifest></pre>

	<p>For more information about the manifest file, see the documentation for <a href="{@docRoot}guide/manifest/manifest-intro.html">AndroidManifest.xml</a>.</p>		<p>For more information about the manifest file, see the documentation for <a
			href="{@docRoot}guide/topics/manifest/manifest-intro.html">AndroidManifest.xml</a>.</p>

	<h3 id="depAppBuild">Building a dependent application</h3>		<h3 id="depAppBuild">Building a dependent application</h3>

docs/html/guide/samples/index.jd

+6 −92

Original line number	Original line	Diff line number	Diff line
	@@ -3,99 +3,13 @@ page.title=Sample Code
	@jd:body		@jd:body


	<p>Sometimes, the best way to learn how things are done is to look at some code.		<script type="text/javascript">
	Here, you can browse the source of some sample Android applications that are included		window.location = toRoot + "resources/samples/index.html";
	in the Android SDK.</p>		</script>

	<p>Each version of the Android platform available for the SDK includes a full set of sample		<p><strong>This document has moved. Please go to <a
	applications (which may vary between different versions of the platform).		href="http://developer.android.com/resources/samples/index.html">List of Sample
	You can find the samples in your SDK at:</p>		Apps</a>.</strong></p>

	<p style="margin-left:2em">
	<code><em><sdk></em>/platforms/android-<em><version></em>/samples/</code>
	</p>

	<p>You can easily create new Android projects with these samples, modify them
	if you'd like, then run them on an emulator or device. For example, to create
	a project for the API Demos app from Eclipse,
	start a new Android Project, select "Create project from existing source", then select
	{@code ApiDemos} in the {@code samples/} directory. To create the API Demos project
	using the {@code android} tool, execute:</p>
	<pre>
	android update project -s -n API Demos -t <em><target_ID></em> -p <em><path-to-platform></em>/samples/ApiDemos/
	</pre>

	<p>The pages below provide an overview of each sample application (available with most
	platforms) and allow you to view the source files in your browser. </p>

	<div class="special">
	<p>Some of the samples in this listing are not yet available in the
	SDK. While we work to update the SDK, you can
	<a href="{@docRoot}shareables/latest_samples.zip">download the latest samples</a> as a ZIP
	archive.</p>
	</div>

	<dl>

	<dt><a href="{@docRoot}resources/samples/ApiDemos/index.html">API Demos</a></dt>
	<dd>A variety of small applications that demonstrate an extensive collection of
	framework topics.</dd>

	<dt><a href="{@docRoot}resources/samples/BackupRestore/index.html">Backup and Restore</a></dt>
	<dd>An simple example that illustrates a few different ways for an application to
	implement support for the Android data backup and restore mechanism.</dd>

	<dt><a href="{@docRoot}resources/samples/BluetoothChat/index.html">Bluetooth Chat</a></dt>
	<dd>An application for two-way text messaging over Bluetooth.</dd>

	<dt><a href="{@docRoot}resources/samples/ContactManager/index.html">Contact Manager</a></dt>
	<dd>An application that demonstrates how to query the system contacts provider
	using the <code>ContactsContract</code> API, as
	well as insert contacts into a specific account.</dd>

	<dt><a href="{@docRoot}resources/samples/Home/index.html">Home</a></dt>
	<dd>A home screen replacement application.</dd>

	<dt><a href="{@docRoot}resources/samples/JetBoy/index.html">JetBoy</a></dt>
	<dd>JetBoy is a game that demonstrates the SONiVOX JET interactive music technology,
	with {@link android.media.JetPlayer}.</dd>

	<dt><a href="{@docRoot}resources/samples/LunarLander/index.html">Lunar Lander</a></dt>
	<dd>A classic Lunar Lander game.</dd>

	<dt><a href="{@docRoot}resources/samples/MultiResolution/index.html">Multiple Resolutions</a></dt>
	<dd>A sample application that shows how to use resource directory qualifiers to
	provide different resources for different screen configurations.</dd>

	<dt><a href="{@docRoot}resources/samples/NotePad/index.html">Note Pad</a></dt>
	<dd>An application for saving notes. Similar (but not identical) to the
	<a href="{@docRoot}resources/tutorials/notepad/index.html">Notepad tutorial</a>.</dd>

	<dt><a href="{@docRoot}resources/samples/SearchableDictionary/index.html">Searchable Dictionary</a></dt>
	<dd>A sample application that demonstrates Android's search framework,
	including how to provide search suggestions for Quick Search Box.</dd>

	<dt><a href="{@docRoot}resources/samples/Snake/index.html">Snake</a></dt>
	<dd>An implementation of the classic game "Snake."</dd>

	<dt><a href="{@docRoot}resources/samples/SoftKeyboard/index.html">Soft Keyboard</a></dt>
	<dd>An example of writing an input method for a software keyboard.</dd>

	<dt><a href=""{@docRoot}resources/samples/Wiktionary/index.html">Wiktionary</a></dt>
	<dd>An example of creating interactive widgets for display on the Android
	home screen.</dd>

	<dt><a href="{@docRoot}resources/samples/WiktionarySimple/index.html">Wiktionary (Simplified)</a></dt>
	<dd>A simple Android home screen widgets example.</dd>

	</dl>


	<div class="special">
	<p>For more sample applications, check out
	<a href="http://code.google.com/p/apps-for-android/">apps-for-android</a>, a
	collection of open source applications that demonstrate various Android APIs.
	</p>
	</div>

docs/html/guide/topics/data/backup.jd

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -240,7 +240,7 @@ Backup Service Key is ignored.</p>
	<h2 id="BackupAgent">Extending BackupAgent</h2>		<h2 id="BackupAgent">Extending BackupAgent</h2>

	<p>Most applications shouldn't need to extend the {@link android.app.backup.BackupAgent} class		<p>Most applications shouldn't need to extend the {@link android.app.backup.BackupAgent} class
	directly, but should instead <a href="BackupAgentHelper">extend BackupAgentHelper</a> to take		directly, but should instead <a href="#BackupAgentHelper">extend BackupAgentHelper</a> to take
	advantage of the built-in helper classes that automatically backup and restore your files. However,		advantage of the built-in helper classes that automatically backup and restore your files. However,
	you might want to extend {@link android.app.backup.BackupAgent} directly if you need to:</p>		you might want to extend {@link android.app.backup.BackupAgent} directly if you need to:</p>
	<ul>		<ul>
	@@ -262,7 +262,7 @@ create your table and insert the data during a restore operation.</li>
	<p>If you don't need to perform any of the tasks above and want to back up complete files from		<p>If you don't need to perform any of the tasks above and want to back up complete files from
	{@link android.content.SharedPreferences} or <a		{@link android.content.SharedPreferences} or <a
	href="{@docRoot}guide/topics/data/data-storage.html#filesInternal">internal storage</a>, you		href="{@docRoot}guide/topics/data/data-storage.html#filesInternal">internal storage</a>, you
	should skip to <a href="BackupAgentHelper">Extending BackupAgentHelper</a>.</p>		should skip to <a href="#BackupAgentHelper">Extending BackupAgentHelper</a>.</p>

docs/html/guide/topics/resources/providing-resources.jd

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -761,7 +761,7 @@ Android runs your application, it will crash if you do not provide default resou
	cannot use the resources named with the new qualifier. For example, if your <a		cannot use the resources named with the new qualifier. For example, if your <a
	href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code		href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#min">{@code
	minSdkVersion}</a> is set to 4, and you qualify all of your drawable resources using <a		minSdkVersion}</a> is set to 4, and you qualify all of your drawable resources using <a
	href="NightQualifier">night mode</a> ({@code night} or {@code notnight}, which were added in API		href="#NightQualifier">night mode</a> ({@code night} or {@code notnight}, which were added in API
	Level 8), then an API Level 4 device cannot access your drawable resources and will crash. In this		Level 8), then an API Level 4 device cannot access your drawable resources and will crash. In this
	case, you probably want {@code notnight} to be your default resources, so you should exclude that		case, you probably want {@code notnight} to be your default resources, so you should exclude that
	qualifier so your drawable resources are in either {@code drawable/} or {@code drawable-night/}.</p>		qualifier so your drawable resources are in either {@code drawable/} or {@code drawable-night/}.</p>