diff options
author | Scott Main <smain@google.com> | 2012-08-14 12:38:21 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-08-14 12:38:22 -0700 |
commit | 6958c161a9f12aaa1db33bdc526040c3691638dc (patch) | |
tree | 2da0ac165b0b3c7fe781c632bbb8025591c64cdf | |
parent | 116748d0d16f8e747fdfdaf2326d9a58bb2317d5 (diff) | |
parent | 183bf116978e3c44292c9ead2bceb47e972624a1 (diff) | |
download | base-6958c161a9f12aaa1db33bdc526040c3691638dc.tar.gz |
Merge "docs: misc bug fixes from external issues" into jb-dev
-rw-r--r-- | core/java/android/app/Notification.java | 10 | ||||
-rwxr-xr-x | core/java/android/content/res/Resources.java | 12 | ||||
-rw-r--r-- | core/java/android/content/res/TypedArray.java | 2 | ||||
-rw-r--r-- | docs/html/guide/topics/media/camera.jd | 2 | ||||
-rw-r--r-- | docs/html/guide/topics/ui/controls/radiobutton.jd | 2 | ||||
-rw-r--r-- | docs/html/guide/topics/ui/settings.jd | 2 | ||||
-rw-r--r-- | docs/html/training/basics/activity-lifecycle/starting.jd | 2 | ||||
-rw-r--r-- | docs/html/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 b2e69de2278b..cb83dc2cdcb5 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("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 c630bb51c96c..ab2fe1ca10f6 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 2df492e74612..2968fbb50909 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 a63270a77ead..3fe23f8ce73a 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 f6f6d49f7294..c96e57649abc 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 fd3b684e2c8f..33e164b1f733 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" /> </PreferenceScreen> </pre> diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd index 1a4bc2da5b4f..dd17304d8102 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 4d0a84a6133b..3dafcfa3f96b 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> |