summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@google.com>2010-12-16 12:54:03 -0500
committerDaniel Sandler <dsandler@google.com>2010-12-16 12:54:03 -0500
commit6f6cf3c5e577aa62cfd959fa5ef046531090ce31 (patch)
treec9293b2dac1f3e9ee0a93e804c3ebea805d99d4d /packages
parent6a4d0a6af20d4ba88f8eeb658c68757c0926cbc5 (diff)
downloadframeworks_base-6f6cf3c5e577aa62cfd959fa5ef046531090ce31.zip
frameworks_base-6f6cf3c5e577aa62cfd959fa5ef046531090ce31.tar.gz
frameworks_base-6f6cf3c5e577aa62cfd959fa5ef046531090ce31.tar.bz2
Reimplement StatusBarManager.disable(DISABLE_SYSTEM_INFO).
Bug: 3284968 Change-Id: I7171b7770c2972bb56672a771c7ed5ca10fb4dda
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java25
1 files changed, 5 insertions, 20 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 b8c068e..2566249 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
@@ -393,7 +393,6 @@ public class TabletStatusBar extends StatusBar {
// set the initial view visibility
setAreThereNotifications();
- refreshNotificationTrigger();
// Add the windows
addPanelWindows();
@@ -505,23 +504,6 @@ public class TabletStatusBar extends StatusBar {
}
}
- public void refreshNotificationTrigger() {
- /*
- if (mNotificationTrigger == null) return;
-
- int resId;
- boolean panel = (mNotificationPanel != null && mNotificationPanel.isShowing();
- if (!mNotificationsOn) {
- resId = R.drawable.ic_sysbar_noti_dnd;
- } else if (mNotns.size() > 0) {
- resId = panel ? R.drawable.ic_sysbar_noti_avail_open : R.drawable.ic_sysbar_noti_avail;
- } else {
- resId = panel ? R.drawable.ic_sysbar_noti_none_open : R.drawable.ic_sysbar_noti_none;
- }
- //mNotificationTrigger.setImageResource(resId);
- */
- }
-
public void addIcon(String slot, int index, int viewIndex, StatusBarIcon icon) {
if (DEBUG) Slog.d(TAG, "addIcon(" + slot + ") -> " + icon);
}
@@ -669,6 +651,11 @@ public class TabletStatusBar extends StatusBar {
Slog.d(TAG, "DISABLE_CLOCK: " + (show ? "no" : "yes"));
showClock(show);
}
+ if ((diff & StatusBarManager.DISABLE_SYSTEM_INFO) != 0) {
+ boolean show = (state & StatusBarManager.DISABLE_SYSTEM_INFO) == 0;
+ Slog.d(TAG, "DISABLE_SYSTEM_INFO: " + (show ? "no" : "yes"));
+ mNotificationTrigger.setVisibility(show ? View.VISIBLE : View.GONE);
+ }
if ((diff & StatusBarManager.DISABLE_EXPAND) != 0) {
if ((state & StatusBarManager.DISABLE_EXPAND) != 0) {
Slog.d(TAG, "DISABLE_EXPAND: yes");
@@ -820,7 +807,6 @@ public class TabletStatusBar extends StatusBar {
if (!mNotificationsOn) {
mNotificationsOn = true;
mIconLayout.setVisibility(View.VISIBLE); // TODO: animation
- refreshNotificationTrigger();
} else {
int msg = !mNotificationPanel.isShowing()
? MSG_OPEN_NOTIFICATION_PANEL
@@ -1068,7 +1054,6 @@ public class TabletStatusBar extends StatusBar {
}
loadNotificationPanel();
- refreshNotificationTrigger();
}
private void loadNotificationPanel() {