summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-06-13 07:07:02 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-13 07:07:02 -0700
commit7d2e8960d0fcebf924c60dbd0f6934368ceb80e3 (patch)
treed379f3760d2f82a9f40eb1f74bc447b82c6c6313
parentcbf026fc1f595c4e13d411bc61d5008eaf7b460c (diff)
parent602ad1c978ddbf8be2c272cd610e18a626cd8b33 (diff)
downloadframeworks_base-7d2e8960d0fcebf924c60dbd0f6934368ceb80e3.zip
frameworks_base-7d2e8960d0fcebf924c60dbd0f6934368ceb80e3.tar.gz
frameworks_base-7d2e8960d0fcebf924c60dbd0f6934368ceb80e3.tar.bz2
Merge ""Two actions ought to be enough for anybody."" into jb-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 caade70..ec35a3f 100644
--- a/core/java/android/app/Notification.java
+++ b/core/java/android/app/Notification.java
@@ -911,7 +911,7 @@ public class Notification implements Parcelable
* </pre>
*/
public static class Builder {
- private static final int MAX_ACTION_BUTTONS = 2;
+ private static final int MAX_ACTION_BUTTONS = 3;
private Context mContext;