Merge "fix javadocs b/14414251" into klp-modular-dev

This commit is contained in:
Robert Ly
2014-06-17 19:21:19 +00:00
committed by Android (Google) Code Review

View File

@@ -2488,16 +2488,16 @@ public class Notification implements Parcelable
/** /**
* Helper class for generating large-format notifications that include a large image attachment. * Helper class for generating large-format notifications that include a large image attachment.
* *
* This class is a "rebuilder": It consumes a Builder object and modifies its behavior, like so: * Here's how you'd set the <code>BigPictureStyle</code> on a notification:
* <pre class="prettyprint"> * <pre class="prettyprint">
* Notification noti = new Notification.BigPictureStyle( * Notification notif = new Notification.Builder(mContext)
* new Notification.Builder() * .setContentTitle(&quot;New photo from &quot; + sender.toString())
* .setContentTitle(&quot;New photo from &quot; + sender.toString()) * .setContentText(subject)
* .setContentText(subject) * .setSmallIcon(R.drawable.new_post)
* .setSmallIcon(R.drawable.new_post) * .setLargeIcon(aBitmap)
* .setLargeIcon(aBitmap)) * .setStyle(new Notification.BigPictureStyle()
* .bigPicture(aBigBitmap) * .bigPicture(aBigBitmap))
* .build(); * .build();
* </pre> * </pre>
* *
* @see Notification#bigContentView * @see Notification#bigContentView
@@ -2584,16 +2584,16 @@ public class Notification implements Parcelable
/** /**
* Helper class for generating large-format notifications that include a lot of text. * Helper class for generating large-format notifications that include a lot of text.
* *
* This class is a "rebuilder": It consumes a Builder object and modifies its behavior, like so: * Here's how you'd set the <code>BigTextStyle</code> on a notification:
* <pre class="prettyprint"> * <pre class="prettyprint">
* Notification noti = new Notification.BigTextStyle( * Notification notif = new Notification.Builder(mContext)
* new Notification.Builder() * .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) * .setLargeIcon(aBitmap)
* .setLargeIcon(aBitmap)) * .setStyle(new Notification.BigTextStyle()
* .bigText(aVeryLongString) * .bigText(aVeryLongString))
* .build(); * .build();
* </pre> * </pre>
* *
* @see Notification#bigContentView * @see Notification#bigContentView
@@ -2678,19 +2678,19 @@ public class Notification implements Parcelable
/** /**
* Helper class for generating large-format notifications that include a list of (up to 5) strings. * Helper class for generating large-format notifications that include a list of (up to 5) strings.
* *
* This class is a "rebuilder": It consumes a Builder object and modifies its behavior, like so: * Here's how you'd set the <code>InboxStyle</code> on a notification:
* <pre class="prettyprint"> * <pre class="prettyprint">
* Notification noti = new Notification.InboxStyle( * Notification notif = new Notification.Builder(mContext)
* new Notification.Builder() * .setContentTitle(&quot;5 New mails from &quot; + sender.toString())
* .setContentTitle(&quot;5 New mails from &quot; + sender.toString()) * .setContentText(subject)
* .setContentText(subject) * .setSmallIcon(R.drawable.new_mail)
* .setSmallIcon(R.drawable.new_mail) * .setLargeIcon(aBitmap)
* .setLargeIcon(aBitmap)) * .setStyle(new Notification.InboxStyle()
* .addLine(str1) * .addLine(str1)
* .addLine(str2) * .addLine(str2)
* .setContentTitle("") * .setContentTitle(&quot;&quot;)
* .setSummaryText(&quot;+3 more&quot;) * .setSummaryText(&quot;+3 more&quot;))
* .build(); * .build();
* </pre> * </pre>
* *
* @see Notification#bigContentView * @see Notification#bigContentView