diff options
| author | Christoph Studer <chstuder@google.com> | 2014-09-03 12:37:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-03 12:37:52 +0000 |
| commit | fe5fe6431b095b43bc64dad6f184680b6aa527a8 (patch) | |
| tree | 14d18698730fd7f5941d7645cf35954c0449681c | |
| parent | 7628d171f5fbdb3b6f8a653ada78d543d5b1167c (diff) | |
| parent | 1097b155698190d6ce79ef20edf45737d9f8de19 (diff) | |
| download | frameworks_base-fe5fe6431b095b43bc64dad6f184680b6aa527a8.zip frameworks_base-fe5fe6431b095b43bc64dad6f184680b6aa527a8.tar.gz frameworks_base-fe5fe6431b095b43bc64dad6f184680b6aa527a8.tar.bz2 | |
am 342ece75: Merge "NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT" into lmp-dev
* commit '342ece751b683d4532e273f196f4f99dfc569067':
NoMan: Drop archive size to 100, strip EXTRA_BIG_TEXT
| -rw-r--r-- | core/java/android/app/Notification.java | 1 | ||||
| -rw-r--r-- | core/java/android/service/notification/NotificationListenerService.java | 1 | ||||
| -rw-r--r-- | core/res/res/values/config.xml | 2 |
3 files changed, 3 insertions, 1 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 diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f5f079c..988198a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -628,7 +628,7 @@ <integer name="config_notificationsBatteryLedOff">2875</integer> <!-- Number of notifications to keep in the notification service historical archive --> - <integer name="config_notificationServiceArchiveSize">250</integer> + <integer name="config_notificationServiceArchiveSize">100</integer> <!-- Allow the menu hard key to be disabled in LockScreen on some devices --> <bool name="config_disableMenuKeyInLockScreen">false</bool> |