summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2011-01-31 09:04:32 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-31 09:04:32 -0800
commitcb9d4d28be41c72a8c6f254bf8fdaac5f41e0b6f (patch)
tree2e1f64a03e4832d72aa771c3c688ce05d1d4b545 /packages/SystemUI
parent81f4b582d4f3547bcd432da6bcb21d4ef414723d (diff)
parent2c83180e70155a9c56796bc01ff345e35dc94ff8 (diff)
downloadframeworks_base-cb9d4d28be41c72a8c6f254bf8fdaac5f41e0b6f.zip
frameworks_base-cb9d4d28be41c72a8c6f254bf8fdaac5f41e0b6f.tar.gz
frameworks_base-cb9d4d28be41c72a8c6f254bf8fdaac5f41e0b6f.tar.bz2
Merge "Kill spurious animations when vetoing notifications." into honeycomb
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java2
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 22fed63..2ec2af0 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);
}
}