am 88fb463e: am 0bb83b07: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev

* commit '88fb463ea355303f03535a29ac5935bf69d8a50e':
  Fix MediaStyle docs mentioning 2 max actions in compact view
This commit is contained in:
Christoph Studer
2014-12-16 18:31:53 +00:00
committed by Android Git Automerger

View File

@@ -4099,7 +4099,7 @@ public class Notification implements Parcelable
*
* Unlike the other styles provided here, MediaStyle can also modify the standard-size
* {@link Notification#contentView}; by providing action indices to
* {@link #setShowActionsInCompactView(int...)} you can promote up to 2 actions to be displayed
* {@link #setShowActionsInCompactView(int...)} you can promote up to 3 actions to be displayed
* in the standard view alongside the usual content.
*
* Notifications created with MediaStyle will have their category set to