summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/src/com/android/systemui
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2012-06-14 07:15:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-14 07:15:29 -0700
commita1d40e47f6aa976da584136ea6f6ba76e7046d11 (patch)
treefb166b7f9c6978c1d9f9fe396089e7dc4894b5a9 /packages/SystemUI/src/com/android/systemui
parentc07dc74374d05cc35f73a933c980a0ef974a7b58 (diff)
parent66d92f81093e648186b31d0416555ec05aff0e0b (diff)
downloadframeworks_base-a1d40e47f6aa976da584136ea6f6ba76e7046d11.zip
frameworks_base-a1d40e47f6aa976da584136ea6f6ba76e7046d11.tar.gz
frameworks_base-a1d40e47f6aa976da584136ea6f6ba76e7046d11.tar.bz2
Merge "Remove an unnecessary animation." into jb-dev
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 56de506..7ea308a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -171,6 +171,7 @@ public class PhoneStatusBar extends BaseStatusBar {
final Rect mNotificationPanelBackgroundPadding = new Rect();
int mNotificationPanelGravity;
int mNotificationPanelMinHeight;
+ boolean mNotificationPanelIsFullScreenWidth;
// top bar
View mClearButton;
@@ -361,9 +362,11 @@ public class PhoneStatusBar extends BaseStatusBar {
return true;
}
});
+ mNotificationPanelIsFullScreenWidth =
+ (mNotificationPanel.getLayoutParams().width == ViewGroup.LayoutParams.MATCH_PARENT);
mNotificationPanel.setSystemUiVisibility(
View.STATUS_BAR_DISABLE_NOTIFICATION_TICKER
- | View.STATUS_BAR_DISABLE_SYSTEM_INFO);
+ | (mNotificationPanelIsFullScreenWidth ? 0 : View.STATUS_BAR_DISABLE_SYSTEM_INFO));
if (!ActivityManager.isHighEndGfx(mDisplay)) {
mStatusBarWindow.setBackground(null);