diff options
| author | Christoph Studer <chstuder@google.com> | 2014-12-17 12:22:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 12:22:33 +0000 |
| commit | 3eff1e1f0e685e1dbb7e2621f5a8ab51a1c321d7 (patch) | |
| tree | 6c11b1b74daa3012235d0b78d2546db76553dbfc /core/java/android | |
| parent | 6ff265cc882cd7512efcf4736b014ac27e77e5fe (diff) | |
| parent | 92c411b24eaa787158b19b209050ea35fc5070b6 (diff) | |
am 92c411b2: Merge "Fix MediaStyle docs mentioning 2 max actions in compact view" into lmp-docs
* commit '92c411b24eaa787158b19b209050ea35fc5070b6':
Fix MediaStyle docs mentioning 2 max actions in compact view
Diffstat (limited to 'core/java/android')
| -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 fb10e17adb00..6d524eb8f268 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 |