Merge "AOD: Do not show guts nor snooze" into oc-dev

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

@@ -227,6 +227,7 @@ public class NotificationMenuRow implements NotificationMenuRowPlugin, View.OnCl
                 if (mShouldShowMenu
                         && !NotificationStackScrollLayout.isPinnedHeadsUp(view)
                         && !mParent.areGutsExposed()
+                        && !mParent.isDark()
                         && (mCheckForDrag == null || !mHandler.hasCallbacks(mCheckForDrag))) {
                     // Only show the menu if we're not a heads up view and guts aren't exposed.
                     mCheckForDrag = new CheckForDrag();

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

@@ -5862,6 +5862,9 @@ public class StatusBar extends SystemUI implements DemoMode,
                 }
 
                 final ExpandableNotificationRow row = (ExpandableNotificationRow) v;
+                if (row.isDark()) {
+                    return false;
+                }
                 bindGuts(row, item);
                 NotificationGuts guts = row.getGuts();