diff options
| author | Christoph Studer <chstuder@google.com> | 2014-09-03 12:28:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-03 12:28:29 +0000 |
| commit | 1097b155698190d6ce79ef20edf45737d9f8de19 (patch) | |
| tree | 5146296f069e07e71847d007d00e50da2eed7e60 /core/java/android | |
| parent | 52c0f04cbcd9cb0d98d40b504256e2b3b110e6fc (diff) | |
| parent | 223f44e1d2cc56fa965cdb9f112afae1c498cbbd (diff) | |
| download | frameworks_base-1097b155698190d6ce79ef20edf45737d9f8de19.zip frameworks_base-1097b155698190d6ce79ef20edf45737d9f8de19.tar.gz frameworks_base-1097b155698190d6ce79ef20edf45737d9f8de19.tar.bz2 | |
Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/Notification.java | 1 | ||||
| -rw-r--r-- | core/java/android/service/notification/NotificationListenerService.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/app/Notification.java b/core/java/android/app/Notification.java index 800734a..6cc6fb2 100644 --- a/core/java/android/app/Notification.java +++ b/core/java/android/app/Notification.java @@ -1423,6 +1423,7 @@ public class Notification implements Parcelable extras.remove(Notification.EXTRA_LARGE_ICON); extras.remove(Notification.EXTRA_LARGE_ICON_BIG); extras.remove(Notification.EXTRA_PICTURE); + extras.remove(Notification.EXTRA_BIG_TEXT); // Prevent light notifications from being rebuilt. extras.remove(Builder.EXTRA_NEEDS_REBUILD); } diff --git a/core/java/android/service/notification/NotificationListenerService.java b/core/java/android/service/notification/NotificationListenerService.java index cb0bcf2..fc12101 100644 --- a/core/java/android/service/notification/NotificationListenerService.java +++ b/core/java/android/service/notification/NotificationListenerService.java @@ -101,6 +101,7 @@ public abstract class NotificationListenerService extends Service { * <li>{@link Notification#EXTRA_LARGE_ICON extras[EXTRA_LARGE_ICON]}</li> * <li>{@link Notification#EXTRA_LARGE_ICON_BIG extras[EXTRA_LARGE_ICON_BIG]}</li> * <li>{@link Notification#EXTRA_PICTURE extras[EXTRA_PICTURE]}</li> + * <li>{@link Notification#EXTRA_BIG_TEXT extras[EXTRA_BIG_TEXT]}</li> * </ol> * * @hide |