am cb9d4d28: Merge "Kill spurious animations when vetoing notifications." into honeycomb

* commit 'cb9d4d28be41c72a8c6f254bf8fdaac5f41e0b6f':
  Kill spurious animations when vetoing notifications.

1 files changed, 1 insertions, 1 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
index 22fed63a0394..2ec2af0cf525 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
@@ -170,7 +170,7 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel,
             setContentFrameVisible(n > 0, false);
         } else if (mSettingsView == null) {
             // we're looking at the notifications; time to maybe make some changes
-            if (mNotificationCount != n) {
+            if ((mNotificationCount > 0) != (n > 0)) {
                 setContentFrameVisible(n > 0, true);
             }
         }