diff options
| author | Daniel Sandler <dsandler@google.com> | 2011-08-04 08:44:51 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-04 08:44:51 -0700 |
| commit | 8d77e7714bce81305958c7003b531de32e941d74 (patch) | |
| tree | dc6d807fe34720875b76532434da50eed86aacf7 | |
| parent | 7abaecc3dbb610b24e22685e6aa749c7011be1eb (diff) | |
| parent | 8e41f3158d3aeabd98fcaa7a846874129a9f39f6 (diff) | |
| download | frameworks_base-8d77e7714bce81305958c7003b531de32e941d74.zip frameworks_base-8d77e7714bce81305958c7003b531de32e941d74.tar.gz frameworks_base-8d77e7714bce81305958c7003b531de32e941d74.tar.bz2 | |
Merge "Restore DISABLE_NOTIFICATION_ICONS."
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java index dc7e313..c7b6f20 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -1606,6 +1606,10 @@ public class TabletStatusBar extends StatusBar implements } return; + } else if (0 != (mDisabled & StatusBarManager.DISABLE_NOTIFICATION_ICONS)) { + // if icons are disabled but we're not in DND mode, this is probably Setup and we should + // just leave the area totally empty + return; } int N = mNotificationData.size(); |