summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-08-06 15:48:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-08-06 15:48:08 -0700
commitbd24f5cca5e51ba0e819f943b981cf2e9f64ec46 (patch)
tree9251edbeec0655cea4cb9909f1059fbbadf7647e /docs
parenta82220fef779cff41fc628e63bbd03dc02c4a6a0 (diff)
parent53b0fda5fd7c532fc1d93abd5f8a85276821cc6d (diff)
downloadframeworks_base-bd24f5cca5e51ba0e819f943b981cf2e9f64ec46.zip
frameworks_base-bd24f5cca5e51ba0e819f943b981cf2e9f64ec46.tar.gz
frameworks_base-bd24f5cca5e51ba0e819f943b981cf2e9f64ec46.tar.bz2
am 53b0fda5: misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
* commit '53b0fda5fd7c532fc1d93abd5f8a85276821cc6d': misc doc bugs. Fix sdk samples path Fix method signature in fragment doc code snippet Fix typo in a11y javadoc code snippet Fix markup error in brands page Fix markup error on content providers doc Fix typo on about>start page
Diffstat (limited to 'docs')
-rw-r--r--docs/html/about/start.jd4
-rw-r--r--docs/html/distribute/googleplay/promote/brand.jd4
-rw-r--r--docs/html/guide/topics/providers/content-provider-basics.jd10
-rw-r--r--docs/html/tools/samples/index.jd15
-rw-r--r--docs/html/training/basics/fragments/communicating.jd2
5 files changed, 18 insertions, 17 deletions
diff --git a/docs/html/about/start.jd b/docs/html/about/start.jd
index af8344d..fbe70e3 100644
--- a/docs/html/about/start.jd
+++ b/docs/html/about/start.jd
@@ -29,9 +29,9 @@ h2.green+hr{background:#99CC00}
<p>Before you write a single line of code, you need to design the user interface and make it fit
the Android user experience. Although you may know what a user will <em>do</em> with your app, you
should pause to focus on how a user will <em>interact</em> with it. Your design should be sleek,
-simple, powereful, and tailored to the Android experience.</p>
+simple, powerful, and tailored to the Android experience.</p>
-<p>So whether your a one-man shop or a large team, you should study the <a
+<p>So whether you're a one-man shop or a large team, you should study the <a
href="{@docRoot}design/index.html">Design</a> guidelines first.</p>
</div>
diff --git a/docs/html/distribute/googleplay/promote/brand.jd b/docs/html/distribute/googleplay/promote/brand.jd
index 8d04903..76ed619 100644
--- a/docs/html/distribute/googleplay/promote/brand.jd
+++ b/docs/html/distribute/googleplay/promote/brand.jd
@@ -150,7 +150,7 @@ any way you want, provided that you follow the guidelines described below.</p>
<span style="margin-left:1em;">http://play.google.com/store/search?q=<em>yourCompanyName</em></span>
</li>
<li>A list of products published by you, for example,<br />
- <span style="margin-left:1em;">http://play.google.com/store/search?q=<em>publisherName</em>M/span>
+ <span style="margin-left:1em;">http://play.google.com/store/search?q=<em>publisherName</em></span>
</li>
<li>A specific app product details page within Google Play, for example,<br />
<span style="margin-left:1em;">http://play.google.com/store/apps/details?id=<em>packageName</em></span>
@@ -171,4 +171,4 @@ any way you want, provided that you follow the guidelines described below.</p>
<h2>Other Brands</h2>
<p>Any other brands or icons depicted on this site are <em>not</em> are the property of their
-repective owners and usage is reserved. You must seek the developer for appropriate permission to use them.</p>
+respective owners and usage is reserved. You must seek the developer for appropriate permission to use them.</p>
diff --git a/docs/html/guide/topics/providers/content-provider-basics.jd b/docs/html/guide/topics/providers/content-provider-basics.jd
index f5e4805..8c47ad7 100644
--- a/docs/html/guide/topics/providers/content-provider-basics.jd
+++ b/docs/html/guide/topics/providers/content-provider-basics.jd
@@ -1030,12 +1030,12 @@ mRowsDeleted = getContentResolver().delete(
A provider defines URI permissions for content URIs in its manifest, using the
<code><a href="{@docRoot}guide/topics/manifest/provider-element.html#gprmsn">
android:grantUriPermission</a></code>
- attribute of the
- {@code <a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a>}
+ attribute of the <a href="{@docRoot}guide/topics/manifest/provider-element.html">
+ {@code &lt;provider&gt;}</a>
element, as well as the
- {@code <a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">
- &lt;grant-uri-permission&gt;</a>} child element of the
- {@code <a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;provider&gt;</a>}
+ <a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">{@code
+ &lt;grant-uri-permission&gt;}</a> child element of the
+ <a href="{@docRoot}guide/topics/manifest/provider-element.html">{@code &lt;provider&gt;}</a>
element. The URI permissions mechanism is explained in more detail in the
<a href="{@docRoot}guide/topics/security/security.html">Security and Permissions</a> guide,
in the section "URI Permissions".
diff --git a/docs/html/tools/samples/index.jd b/docs/html/tools/samples/index.jd
index 5c0e8db..ed416e6 100644
--- a/docs/html/tools/samples/index.jd
+++ b/docs/html/tools/samples/index.jd
@@ -3,7 +3,8 @@ page.title=Samples
@jd:body
<p>To help you understand some fundamental Android APIs and coding practices, a variety of sample
-code is available from the Android SDK Manager.</p>
+code is available from the Android SDK Manager. Each version of the Android platform available
+from the SDK Manager offers its own set of sample apps.</p>
<p>To download the samples:</p>
<ol>
@@ -18,14 +19,14 @@ Android SDK, then execute {@code android sdk}.</ul>
<li>Select and download <em>Samples for SDK</em>.</li>
</ol>
-<p>When the download is complete, you can find the samples sources at this location:</p>
+<p>When the download is complete, you can find the source code for all samples at this location:</p>
<p style="margin-left:2em">
-<code><em>&lt;sdk&gt;</em>/platforms/&lt;android-version>/samples/</code>
+<code>&lt;sdk&gt;/samples/android-&lt;version>/</code>
</p>
+<p>The {@code &lt;version>} number corresponds to the platform's
+ <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API level</a>.</p>
+
<p>You can easily create new Android projects with the downloaded samples, modify them
-if you'd like, and then run them on an emulator or device. </p>
-<!--
-<p>Below are summaries for several of the available samples.</p>
---> \ No newline at end of file
+if you'd like, and then run them on an emulator or device.</p> \ No newline at end of file
diff --git a/docs/html/training/basics/fragments/communicating.jd b/docs/html/training/basics/fragments/communicating.jd
index 3ac9873..eb9b368 100644
--- a/docs/html/training/basics/fragments/communicating.jd
+++ b/docs/html/training/basics/fragments/communicating.jd
@@ -108,7 +108,7 @@ public static class MainActivity extends Activity
implements HeadlinesFragment.OnHeadlineSelectedListener{
...
- public void onArticleSelected(Uri articleUri) {
+ public void onArticleSelected(int position) {
// The user selected the headline of an article from the HeadlinesFragment
// Do something here to display that article
}