diff options
author | Christoph Studer <chstuder@google.com> | 2014-12-17 12:16:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-17 12:16:48 +0000 |
commit | 92c411b24eaa787158b19b209050ea35fc5070b6 (patch) | |
tree | 666a3bebe8bbf16568675c88c79ff870182f8b1f | |
parent | df916a89feba37f8d16bd61101d43be7d1667bf8 (diff) | |
parent | 250a141cbeb2b3ef560de3814cfc5338df476182 (diff) | |
download | frameworks_base-92c411b24eaa787158b19b209050ea35fc5070b6.zip frameworks_base-92c411b24eaa787158b19b209050ea35fc5070b6.tar.gz frameworks_base-92c411b24eaa787158b19b209050ea35fc5070b6.tar.bz2 |
Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
-rw-r--r-- | core/java/android/app/Notification.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index fb10e17..6d524eb 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -4000,7 +4000,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 |