summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-08-13 19:12:13 -0700
committerScott Main <smain@google.com>2012-08-13 19:12:13 -0700
commit183bf116978e3c44292c9ead2bceb47e972624a1 (patch)
tree9c612f9b9c61fcfb3661a1022c3dd414b5ecb7c2
parent3e504ac71715a1b152494c9765f41d13bc605b75 (diff)
downloadframeworks_base-183bf116978e3c44292c9ead2bceb47e972624a1.zip
frameworks_base-183bf116978e3c44292c9ead2bceb47e972624a1.tar.gz
frameworks_base-183bf116978e3c44292c9ead2bceb47e972624a1.tar.bz2
docs: misc bug fixes from external issues
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
-rw-r--r--core/java/android/app/Notification.java10
-rwxr-xr-xcore/java/android/content/res/Resources.java12
-rw-r--r--core/java/android/content/res/TypedArray.java2
-rw-r--r--docs/html/guide/topics/media/camera.jd2
-rw-r--r--docs/html/guide/topics/ui/controls/radiobutton.jd2
-rw-r--r--docs/html/guide/topics/ui/settings.jd2
-rw-r--r--docs/html/training/basics/activity-lifecycle/starting.jd2
-rw-r--r--docs/html/training/basics/firstapp/starting-activity.jd4
8 files changed, 20 insertions, 16 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index b2e69de..cb83dc2 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -897,12 +897,16 @@ public class Notification implements Parcelable
* Builder class for {@link Notification} objects.
*
* Provides a convenient way to set the various fields of a {@link Notification} and generate
- * content views using the platform's notification layout template.
+ * content views using the platform's notification layout template. If your app supports
+ * versions of Android as old as API level 4, you can instead use
+ * {@link android.support.v4.app.NotificationCompat.Builder NotificationCompat.Builder},
+ * available in the <a href="{@docRoot}tools/extras/support-library.html">Android Support
+ * library</a>.
*
- * Example:
+ * <p>Example:
*
* <pre class="prettyprint">
- * Notification noti = new Notification.Builder()
+ * Notification noti = new Notification.Builder(mContext)
* .setContentTitle(&quot;New mail from &quot; + sender.toString())
* .setContentText(subject)
* .setSmallIcon(R.drawable.new_mail)
diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java
index c630bb5..ab2fe1c 100755
--- a/core/java/android/content/res/Resources.java
+++ b/core/java/android/content/res/Resources.java
@@ -1120,8 +1120,8 @@ public class Resources {
* Return a StyledAttributes holding the values defined by
* <var>Theme</var> which are listed in <var>attrs</var>.
*
- * <p>Be sure to call StyledAttributes.recycle() when you are done with
- * the array.
+ * <p>Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
+ * with the array.
*
* @param attrs The desired attributes.
*
@@ -1148,8 +1148,8 @@ public class Resources {
* Return a StyledAttributes holding the values defined by the style
* resource <var>resid</var> which are listed in <var>attrs</var>.
*
- * <p>Be sure to call StyledAttributes.recycle() when you are done with
- * the array.
+ * <p>Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
+ * with the array.
*
* @param resid The desired style resource.
* @param attrs The desired attributes in the style.
@@ -1208,8 +1208,8 @@ public class Resources {
* AttributeSet specifies a style class (through the "style" attribute),
* that style will be applied on top of the base attributes it defines.
*
- * <p>Be sure to call StyledAttributes.recycle() when you are done with
- * the array.
+ * <p>Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
+ * with the array.
*
* <p>When determining the final value of a particular attribute, there
* are four inputs that come into play:</p>
diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java
index 2df492e..2968fbb 100644
--- a/core/java/android/content/res/TypedArray.java
+++ b/core/java/android/content/res/TypedArray.java
@@ -684,7 +684,7 @@ public class TypedArray {
}
/**
- * Give back a previously retrieved StyledAttributes, for later re-use.
+ * Give back a previously retrieved array, for later re-use.
*/
public void recycle() {
synchronized (mResources.mTmpValue) {
diff --git a/docs/html/guide/topics/media/camera.jd b/docs/html/guide/topics/media/camera.jd
index a63270a..3fe23f8 100644
--- a/docs/html/guide/topics/media/camera.jd
+++ b/docs/html/guide/topics/media/camera.jd
@@ -617,7 +617,7 @@ public class CameraActivity extends Activity {
// Create our Preview view and set it as the content of our activity.
mPreview = new CameraPreview(this, mCamera);
- FrameLayout preview = (FrameLayout) findViewById(id.camera_preview);
+ FrameLayout preview = (FrameLayout) findViewById(R.id.camera_preview);
preview.addView(mPreview);
}
}
diff --git a/docs/html/guide/topics/ui/controls/radiobutton.jd b/docs/html/guide/topics/ui/controls/radiobutton.jd
index f6f6d49..c96e576 100644
--- a/docs/html/guide/topics/ui/controls/radiobutton.jd
+++ b/docs/html/guide/topics/ui/controls/radiobutton.jd
@@ -72,7 +72,7 @@ click event for both radio buttons:</p>
<pre>
public void onRadioButtonClicked(View view) {
// Is the button now checked?
- boolean checked = (RadioButton) view).isChecked();
+ boolean checked = ((RadioButton) view).isChecked();
// Check which radio button was clicked
switch(view.getId()) {
diff --git a/docs/html/guide/topics/ui/settings.jd b/docs/html/guide/topics/ui/settings.jd
index fd3b684..33e164b 100644
--- a/docs/html/guide/topics/ui/settings.jd
+++ b/docs/html/guide/topics/ui/settings.jd
@@ -217,7 +217,7 @@ item in the list of settings.</p>
android:dialogTitle="@string/pref_syncConnectionType"
android:entries="@array/pref_syncConnectionTypes_entries"
android:entryValues="@array/pref_syncConnectionTypes_values"
- android:defaultValue="@string/pref_syncConnectionTypes_default" >
+ android:defaultValue="@string/pref_syncConnectionTypes_default" />
&lt;/PreferenceScreen>
</pre>
diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd
index 1a4bc2d..dd17304 100644
--- a/docs/html/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html/training/basics/activity-lifecycle/starting.jd
@@ -112,7 +112,7 @@ methods.</p>
</table>
-->
-<p>As you'll learn in the following lessons, there are several situtations in which an activity
+<p>As you'll learn in the following lessons, there are several situations in which an activity
transitions between different states that are illustrated in figure 1. However, only three of
these states can be static. That is, the activity can exist in one of only three states for an
extended period of time:</p>
diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd
index 4d0a84a..3dafcfa 100644
--- a/docs/html/training/basics/firstapp/starting-activity.jd
+++ b/docs/html/training/basics/firstapp/starting-activity.jd
@@ -285,8 +285,8 @@ href="{@docRoot}tools/extras/support-library.html#SettingUp">setting up the Supp
<p>The app is now runnable because the {@link android.content.Intent} in the
first activity now resolves to the {@code DisplayMessageActivity} class. If you run the app now,
-clicking the Send button starts the
-second activity, but it doesn't show anything yet.</p>
+clicking the Send button starts the second activity, but it's still using the default
+"Hello world" layout.</p>
<h2 id="ReceiveIntent">Receive the Intent</h2>