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
Change-Id: Ie2a528dd4fbd19e5cb1c0844f6fc6272669c8ab9
diff --git a/core/java/android/accessibilityservice/AccessibilityService.java b/core/java/android/accessibilityservice/AccessibilityService.java
index b6001eb..81ee192 100644
--- a/core/java/android/accessibilityservice/AccessibilityService.java
+++ b/core/java/android/accessibilityservice/AccessibilityService.java
@@ -66,7 +66,7 @@
* accessibility service. Following is an example declaration:
* </p>
* <pre> <service android:name=".MyAccessibilityService"
- * android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE>
+ * android:permission="android.permission.BIND_ACCESSIBILITY_SERVICE">
* <intent-filter>
* <action android:name="android.accessibilityservice.AccessibilityService" />
* </intent-filter>
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 @@
<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 @@
<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 @@
<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 @@
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"><provider></a>}
+ attribute of the <a href="{@docRoot}guide/topics/manifest/provider-element.html">
+ {@code <provider>}</a>
element, as well as the
- {@code <a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">
- <grant-uri-permission></a>} child element of the
- {@code <a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a>}
+ <a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">{@code
+ <grant-uri-permission>}</a> child element of the
+ <a href="{@docRoot}guide/topics/manifest/provider-element.html">{@code <provider>}</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 @@
@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 @@
<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><sdk></em>/platforms/<android-version>/samples/</code>
+<code><sdk>/samples/android-<version>/</code>
</p>
+<p>The {@code <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 @@
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
}