am a5d1dc9d: am bd63fb87: am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev

* commit 'a5d1dc9d0322d2c7b7d7f13816fd551a7042c2a3':
  docs: misc bug fixes from external issues
This commit is contained in:
Scott Main
2012-08-14 12:44:49 -07:00
committed by Android Git Automerger
8 changed files with 20 additions and 16 deletions

View File

@@ -897,12 +897,16 @@ public class Notification implements Parcelable
* Builder class for {@link Notification} objects. * Builder class for {@link Notification} objects.
* *
* Provides a convenient way to set the various fields of a {@link Notification} and generate * 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"> * <pre class="prettyprint">
* Notification noti = new Notification.Builder() * Notification noti = new Notification.Builder(mContext)
* .setContentTitle(&quot;New mail from &quot; + sender.toString()) * .setContentTitle(&quot;New mail from &quot; + sender.toString())
* .setContentText(subject) * .setContentText(subject)
* .setSmallIcon(R.drawable.new_mail) * .setSmallIcon(R.drawable.new_mail)

View File

@@ -1121,8 +1121,8 @@ public class Resources {
* Return a StyledAttributes holding the values defined by * Return a StyledAttributes holding the values defined by
* <var>Theme</var> which are listed in <var>attrs</var>. * <var>Theme</var> which are listed in <var>attrs</var>.
* *
* <p>Be sure to call StyledAttributes.recycle() when you are done with * <p>Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
* the array. * with the array.
* *
* @param attrs The desired attributes. * @param attrs The desired attributes.
* *
@@ -1149,8 +1149,8 @@ public class Resources {
* Return a StyledAttributes holding the values defined by the style * Return a StyledAttributes holding the values defined by the style
* resource <var>resid</var> which are listed in <var>attrs</var>. * resource <var>resid</var> which are listed in <var>attrs</var>.
* *
* <p>Be sure to call StyledAttributes.recycle() when you are done with * <p>Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
* the array. * with the array.
* *
* @param resid The desired style resource. * @param resid The desired style resource.
* @param attrs The desired attributes in the style. * @param attrs The desired attributes in the style.
@@ -1209,8 +1209,8 @@ public class Resources {
* AttributeSet specifies a style class (through the "style" attribute), * AttributeSet specifies a style class (through the "style" attribute),
* that style will be applied on top of the base attributes it defines. * 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 * <p>Be sure to call {@link TypedArray#recycle() TypedArray.recycle()} when you are done
* the array. * with the array.
* *
* <p>When determining the final value of a particular attribute, there * <p>When determining the final value of a particular attribute, there
* are four inputs that come into play:</p> * are four inputs that come into play:</p>

View File

@@ -691,7 +691,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() { public void recycle() {
synchronized (mResources.mTmpValue) { synchronized (mResources.mTmpValue) {

View File

@@ -617,7 +617,7 @@ public class CameraActivity extends Activity {
// Create our Preview view and set it as the content of our activity. // Create our Preview view and set it as the content of our activity.
mPreview = new CameraPreview(this, mCamera); mPreview = new CameraPreview(this, mCamera);
FrameLayout preview = (FrameLayout) findViewById(id.camera_preview); FrameLayout preview = (FrameLayout) findViewById(R.id.camera_preview);
preview.addView(mPreview); preview.addView(mPreview);
} }
} }

View File

@@ -72,7 +72,7 @@ click event for both radio buttons:</p>
<pre> <pre>
public void onRadioButtonClicked(View view) { public void onRadioButtonClicked(View view) {
// Is the button now checked? // Is the button now checked?
boolean checked = (RadioButton) view).isChecked(); boolean checked = ((RadioButton) view).isChecked();
// Check which radio button was clicked // Check which radio button was clicked
switch(view.getId()) { switch(view.getId()) {

View File

@@ -217,7 +217,7 @@ item in the list of settings.</p>
android:dialogTitle="@string/pref_syncConnectionType" android:dialogTitle="@string/pref_syncConnectionType"
android:entries="@array/pref_syncConnectionTypes_entries" android:entries="@array/pref_syncConnectionTypes_entries"
android:entryValues="@array/pref_syncConnectionTypes_values" android:entryValues="@array/pref_syncConnectionTypes_values"
android:defaultValue="@string/pref_syncConnectionTypes_default" > android:defaultValue="@string/pref_syncConnectionTypes_default" />
&lt;/PreferenceScreen> &lt;/PreferenceScreen>
</pre> </pre>

View File

@@ -112,7 +112,7 @@ methods.</p>
</table> </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 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 these states can be static. That is, the activity can exist in one of only three states for an
extended period of time:</p> extended period of time:</p>

View File

@@ -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 <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, first activity now resolves to the {@code DisplayMessageActivity} class. If you run the app now,
clicking the Send button starts the clicking the Send button starts the second activity, but it's still using the default
second activity, but it doesn't show anything yet.</p> "Hello world" layout.</p>
<h2 id="ReceiveIntent">Receive the Intent</h2> <h2 id="ReceiveIntent">Receive the Intent</h2>