am 27b587b6: am faa38a08: am 4422596d: am ce37f1da: am 4979a0b5: am 5f32d337: Merge "Notification.java javadoc: addAction" into jb-dev-docs

* commit '27b587b6867768860c2e3f13567ba3d312d9b952':
  Notification.java javadoc: addAction
This commit is contained in:
Joe Malin
2012-11-13 14:30:51 -08:00
committed by Android Git Automerger

View File

@@ -1381,6 +1381,8 @@ public class Notification implements Parcelable
/** /**
* Add an action to this notification. Actions are typically displayed by * Add an action to this notification. Actions are typically displayed by
* the system as a button adjacent to the notification content. * the system as a button adjacent to the notification content.
* <br>
* A notification displays up to 3 actions, from left to right in the order they were added.
* *
* @param icon Resource ID of a drawable that represents the action. * @param icon Resource ID of a drawable that represents the action.
* @param title Text describing the action. * @param title Text describing the action.