Merge "Display intercepted notifications if configured."

1 files changed, 7 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java b/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java
index 9c39002..8440b9f 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/InterceptedNotifications.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.os.Binder;
 import android.os.IBinder;
 import android.os.Process;
+import android.provider.Settings;
 import android.service.notification.StatusBarNotification;
 import android.util.ArrayMap;
 import android.view.View;
@@ -59,6 +60,7 @@ public class InterceptedNotifications {
 
     public boolean tryIntercept(IBinder key, StatusBarNotification notification) {
         if (!notification.getNotification().extras.getBoolean(EXTRA_INTERCEPT)) return false;
+        if (shouldDisplayIntercepted()) return false;
         mIntercepted.put(key, notification);
         updateSyntheticNotification();
         return true;
@@ -80,6 +82,11 @@ public class InterceptedNotifications {
         }
     }
 
+    private boolean shouldDisplayIntercepted() {
+        return Settings.Secure.getInt(mContext.getContentResolver(),
+                Settings.Secure.DISPLAY_INTERCEPTED_NOTIFICATIONS, 0) != 0;
+    }
+
     private void updateSyntheticNotification() {
         if (mIntercepted.isEmpty()) {
             if (mSynKey != null) {