summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2012-07-25 11:55:09 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-07-25 11:55:09 -0700
commitdd4448ef6807f096cdfdf632857baefd7cbc85ec (patch)
tree9a9cf5d9953881fc1211ba08b1a823a874ad5269
parent7da1ad699989db8417ce54eb26697eae4a30f634 (diff)
parent32189e260c8dee27d561bf67c0333c9b9927636b (diff)
am 32189e26: Merge "misc doc bug fixes" into jb-dev
* commit '32189e260c8dee27d561bf67c0333c9b9927636b': misc doc bug fixes
-rw-r--r--docs/html/guide/topics/ui/controls/checkbox.jd2
-rw-r--r--docs/html/tools/adk/adk.jd2
-rw-r--r--test-runner/src/android/test/ProviderTestCase2.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/guide/topics/ui/controls/checkbox.jd b/docs/html/guide/topics/ui/controls/checkbox.jd
index 35b8f560b15c..ea70980ba096 100644
--- a/docs/html/guide/topics/ui/controls/checkbox.jd
+++ b/docs/html/guide/topics/ui/controls/checkbox.jd
@@ -65,7 +65,7 @@ click event for both checkboxes:</p>
<pre>
public void onCheckboxClicked(View view) {
// Is the view now checked?
- boolean checked = (CheckBox) view).isChecked();
+ boolean checked = ((CheckBox) view).isChecked();
// Check which checkbox was clicked
switch(view.getId()) {
diff --git a/docs/html/tools/adk/adk.jd b/docs/html/tools/adk/adk.jd
index 2a0c7170f786..049b6e92804a 100644
--- a/docs/html/tools/adk/adk.jd
+++ b/docs/html/tools/adk/adk.jd
@@ -41,7 +41,7 @@ page.title=Accessory Development Kit 2011 Guide
<h2>Download</h2>
<ol>
- <li><a href="https://dl-ssl.google.com/android/adk/adk_release_0512.zip">ADK package</a></li>
+ <li><a href="https://dl-ssl.google.com/android/adk/adk_release_20120606.zip">ADK package</a></li>
</ol>
<h2>See also</h2>
diff --git a/test-runner/src/android/test/ProviderTestCase2.java b/test-runner/src/android/test/ProviderTestCase2.java
index 2811b0d4cf5d..f7c4e03db7fd 100644
--- a/test-runner/src/android/test/ProviderTestCase2.java
+++ b/test-runner/src/android/test/ProviderTestCase2.java
@@ -64,7 +64,7 @@ import java.io.File;
* {@link #ProviderTestCase2(Class, String)} as its first operation.
* </p>
* For more information on content provider testing, please see
- * <a href="{@docRoot}guide/topics/testing/provider_testing.html">Content Provider Testing</a>.
+ * <a href="{@docRoot}tools/testing/contentprovider_testing.html">Content Provider Testing</a>.
*/
public abstract class ProviderTestCase2<T extends ContentProvider> extends AndroidTestCase {