SysUI: Display group children when no summary is present

Also move common notification filtering into NotificationData
such that clients won't have to do it themselves anymore.

Probably also fixes a couple of multi-user issues.

Bug: 16302692
Bug: 16224431
Change-Id: Ic3c11cd1a224044486f5544e068ca5297d30c521

Author: Christoph Studer

core/java/android/app/Notification.java

@@ -1731,6 +1731,20 @@ public boolean isValid() {
         return contentView != null || extras.getBoolean(Builder.EXTRA_REBUILD_CONTENT_VIEW);
     }
 
+    /**
+     * @hide
+     */
+    public boolean isGroupSummary() {
+        return mGroupKey != null && (flags & FLAG_GROUP_SUMMARY) != 0;
+    }
+
+    /**
+     * @hide
+     */
+    public boolean isGroupChild() {
+        return mGroupKey != null && (flags & FLAG_GROUP_SUMMARY) == 0;
+    }
+
     /**
      * Builder class for {@link Notification} objects.
      *

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

@@ -36,7 +36,6 @@
 import android.content.res.Configuration;
 import android.database.ContentObserver;
 import android.graphics.Rect;
-import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
@@ -96,7 +95,8 @@
 
 public abstract class BaseStatusBar extends SystemUI implements
         CommandQueue.Callbacks, ActivatableNotificationView.OnActivatedListener,
-        RecentsComponent.Callbacks, ExpandableNotificationRow.ExpansionLogger {
+        RecentsComponent.Callbacks, ExpandableNotificationRow.ExpansionLogger,
+        NotificationData.Environment {
     public static final String TAG = "StatusBar";
     public static final boolean DEBUG = false;
     public static final boolean MULTIUSER_DEBUG = false;
@@ -132,7 +132,7 @@ public abstract class BaseStatusBar extends SystemUI implements
     protected H mHandler = createHandler();
 
     // all notifications
-    protected NotificationData mNotificationData = new NotificationData();
+    protected NotificationData mNotificationData;
     protected NotificationStackScrollLayout mStackScroller;
 
     // for heads up notifications
@@ -201,6 +201,7 @@ public abstract class BaseStatusBar extends SystemUI implements
     protected NotificationOverflowContainer mKeyguardIconOverflowContainer;
     protected DismissView mDismissView;
 
+    @Override  // NotificationData.Environment
     public boolean isDeviceProvisioned() {
         return mDeviceProvisioned;
     }
@@ -304,10 +305,6 @@ public void onListenerConnected() {
                 @Override
                 public void run() {
                     for (StatusBarNotification sbn : notifications) {
-                        if (shouldFilterOut(sbn.getNotification())) {
-                            if (DEBUG) Log.d(TAG, "Ignoring notification: " + sbn);
-                            continue;
-                        }
                         addNotification(sbn, currentRanking);
                     }
                 }
@@ -322,20 +319,8 @@ public void onNotificationPosted(final StatusBarNotification sbn,
                 @Override
                 public void run() {
                     Notification n = sbn.getNotification();
-                    boolean isUpdate = mNotificationData.findByKey(sbn.getKey()) != null
+                    boolean isUpdate = mNotificationData.get(sbn.getKey()) != null
                             || isHeadsUp(sbn.getKey());
-                    if (shouldFilterOut(n)) {
-                        if (DEBUG) Log.d(TAG, "Ignoring notification: " + sbn);
-                        // If this is an update, i.e. the notification existed
-                        // before but wasn't filtered out, remove the old
-                        // instance. Otherwise just update the ranking.
-                        if (isUpdate) {
-                            removeNotification(sbn.getKey(), rankingMap);
-                        } else {
-                            updateNotificationRanking(rankingMap);
-                        }
-                        return;
-                    }
                     if (isUpdate) {
                         updateNotification(sbn, rankingMap);
                     } else {
@@ -368,11 +353,6 @@ public void run() {
             });
         }
 
-        private boolean shouldFilterOut(Notification n) {
-            // Don't accept group children.
-            return n.getGroup() != null
-                    && (n.flags & Notification.FLAG_GROUP_SUMMARY) == 0;
-        }
     };
 
     private void updateCurrentProfilesCache() {
@@ -391,6 +371,8 @@ public void start() {
         mWindowManagerService = WindowManagerGlobal.getWindowManagerService();
         mDisplay = mWindowManager.getDefaultDisplay();
 
+        mNotificationData = new NotificationData(this);
+
         mDreamManager = IDreamManager.Stub.asInterface(
                 ServiceManager.checkService(DreamService.DREAM_SERVICE));
         mPowerManager = (PowerManager) mContext.getSystemService(Context.POWER_SERVICE);
@@ -499,7 +481,8 @@ public boolean isHeadsUp(String key) {
       return mHeadsUpNotificationView != null && mHeadsUpNotificationView.isShowing(key);
     }
 
-    public boolean notificationIsForCurrentProfiles(StatusBarNotification n) {
+    @Override  // NotificationData.Environment
+    public boolean isNotificationForCurrentProfiles(StatusBarNotification n) {
         final int thisUserId = mCurrentUserId;
         final int notificationUserId = n.getUserId();
         if (DEBUG && MULTIUSER_DEBUG) {
@@ -881,6 +864,16 @@ public boolean userAllowsPrivateNotificationsInPublic(int userHandle) {
         return mUsersAllowingPrivateNotifications.get(userHandle);
     }
 
+    /**
+     * Returns true if we're on a secure lockscreen and the user wants to hide "sensitive"
+     * notification data. If so, private notifications should show their (possibly
+     * auto-generated) publicVersion, and secret notifications should be totally invisible.
+     */
+    @Override  // NotificationData.Environment
+    public boolean shouldHideSensitiveContents(int userid) {
+        return isLockscreenPublicMode() && !userAllowsPrivateNotificationsInPublic(userid);
+    }
+
     public void onNotificationClear(StatusBarNotification notification) {
         try {
             mBarService.onNotificationClear(
@@ -1381,11 +1374,14 @@ protected void addNotificationViews(Entry entry, RankingMap ranking) {
     protected void updateRowStates() {
         int maxKeyguardNotifications = getMaxKeyguardNotifications();
         mKeyguardIconOverflowContainer.getIconsView().removeAllViews();
-        final int N = mNotificationData.size();
+
+        ArrayList<Entry> activeNotifications = mNotificationData.getActiveNotifications();
+        final int N = activeNotifications.size();
+
         int visibleNotifications = 0;
         boolean onKeyguard = mState == StatusBarState.KEYGUARD;
         for (int i = 0; i < N; i++) {
-            NotificationData.Entry entry = mNotificationData.get(i);
+            NotificationData.Entry entry = activeNotifications.get(i);
             if (onKeyguard) {
                 entry.row.setExpansionDisabled(true);
             } else {
@@ -1461,7 +1457,7 @@ public void updateNotification(StatusBarNotification notification, RankingMap ra
         if (wasHeadsUp) {
             oldEntry = mHeadsUpNotificationView.getEntry();
         } else {
-            oldEntry = mNotificationData.findByKey(key);
+            oldEntry = mNotificationData.get(key);
         }
         if (oldEntry == null) {
             return;
@@ -1620,6 +1616,7 @@ public void updateNotification(StatusBarNotification notification, RankingMap ra
                             notification.getNotification().tickerText);
                     oldEntry.icon.set(ic);
                     inflateViews(oldEntry, mStackScroller, wasHeadsUp);
+                    mNotificationData.updateRanking(ranking);
                     updateNotifications();
                 }
             }
@@ -1630,7 +1627,7 @@ public void updateNotification(StatusBarNotification notification, RankingMap ra
         updateNotificationVetoButton(oldEntry.row, notification);
 
         // Is this for you?
-        boolean isForCurrentUser = notificationIsForCurrentProfiles(notification);
+        boolean isForCurrentUser = isNotificationForCurrentProfiles(notification);
         if (DEBUG) Log.d(TAG, "notification is " + (isForCurrentUser ? "" : "not ") + "for you");
 
         // Restart the ticker if it's still running
@@ -1725,14 +1722,6 @@ protected boolean shouldInterrupt(StatusBarNotification sbn) {
         return interrupt;
     }
 
-    // Q: What kinds of notifications should show during setup?
-    // A: Almost none! Only things coming from the system (package is "android") that also
-    // have special "kind" tags marking them as relevant for setup (see below).
-    protected boolean showNotificationEvenIfUnprovisioned(StatusBarNotification sbn) {
-        return "android".equals(sbn.getPackageName())
-                && sbn.getNotification().extras.getBoolean(Notification.EXTRA_ALLOW_DURING_SETUP);
-    }
-
     public boolean inKeyguardRestrictedInputMode() {
         return KeyguardTouchDelegate.getInstance(mContext).isInputRestricted();
     }