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

* commit 'a640bb13ed893afd0eaed2dbc7363118caf27209':
  docs: misc bug fixes from external issues
This commit is contained in:
Scott Main
2012-08-14 12:47:31 -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.
*
* 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)

View File

@@ -1121,8 +1121,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.
*
@@ -1149,8 +1149,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.
@@ -1209,8 +1209,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>

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() {
synchronized (mResources.mTmpValue) {