From 183bf116978e3c44292c9ead2bceb47e972624a1 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Mon, 13 Aug 2012 19:12:13 -0700 Subject: [PATCH] docs: misc bug fixes from external issues Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264 --- core/java/android/app/Notification.java | 10 +++++++--- core/java/android/content/res/Resources.java | 12 ++++++------ core/java/android/content/res/TypedArray.java | 2 +- docs/html/guide/topics/media/camera.jd | 2 +- docs/html/guide/topics/ui/controls/radiobutton.jd | 2 +- docs/html/guide/topics/ui/settings.jd | 2 +- .../training/basics/activity-lifecycle/starting.jd | 2 +- .../training/basics/firstapp/starting-activity.jd | 4 ++-- 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index b2e69de2278b2..cb83dc2cdcb50 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 Android Support + * library. * - * Example: + *

Example: * * 

-     * Notification noti = new Notification.Builder()
+     * Notification noti = new Notification.Builder(mContext)
      *         .setContentTitle("New mail from " + 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 c630bb51c96cc..ab2fe1ca10f62 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
          * Theme which are listed in attrs.
          * 
-         * 
Be sure to call StyledAttributes.recycle() when you are done with
-         * the array.
+         * 
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 resid which are listed in attrs.
          * 
-         * 
Be sure to call StyledAttributes.recycle() when you are done with
-         * the array.
+         * 
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.
          * 
-         * 
Be sure to call StyledAttributes.recycle() when you are done with
-         * the array.
+         * 
Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
+         * with the array.
          * 
          * 
When determining the final value of a particular attribute, there
          * are four inputs that come into play:

diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java
index 2df492e746127..2968fbb50909b 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 a63270a77eade..3fe23f8ce73a5 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 f6f6d49f72946..c96e57649abc7 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:

 
 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 fd3b684e2c8f6..33e164b1f733c 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.

         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" />
 </PreferenceScreen>
 

 
diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd
index 1a4bc2da5b4fb..dd17304d81027 100644
--- a/docs/html/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html/training/basics/activity-lifecycle/starting.jd
@@ -112,7 +112,7 @@ methods.

 
 -->
 
-
As you'll learn in the following lessons, there are several situtations in which an activity
+
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:

diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd
index 4d0a84a6133bf..3dafcfa3f96b2 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
 
 
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.

+clicking the Send button starts the second activity, but it's still using the default
+"Hello world" layout.

 
 
 
Receive the Intent