summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Christoph Studer <chstuder@google.com> 2014-12-16 18:16:40 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-12-16 18:16:42 +0000
commit0bb83b07d1602c1a99c938471edfc411a47dbffc (patch)
treed349d9e01be059fe94f70d13000872a33edbfc70
parent67af29f6d642c3c578ee1b5af70dc525955982a5 (diff)
parentfde6f4d745dd3c00c8b9f6c363a2fd331fb61ba6 (diff)
Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-mr1-dev
-rw-r--r--core/java/android/app/Notification.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java
index 9e8a79388af5..3d7bacb0d954 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -4098,7 +4098,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