summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-11-08 15:47:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-08 15:47:46 -0800
commite0d454d2e86f4170bdab68d45696fb2eb9a87f9f (patch)
treef9d7a16a639049bd357d2185264b6da4451548e3 /packages
parent77f2e27e68a851b5cec13e724645972df663d397 (diff)
parent72325cdb65a321df7755ba214efd9be42ce828d5 (diff)
downloadframeworks_base-e0d454d2e86f4170bdab68d45696fb2eb9a87f9f.zip
frameworks_base-e0d454d2e86f4170bdab68d45696fb2eb9a87f9f.tar.gz
frameworks_base-e0d454d2e86f4170bdab68d45696fb2eb9a87f9f.tar.bz2
am 72325cdb: am 63bc6c12: am a46a74fc: Merge "Remove extraneous logs." into jb-mr1-dev
* commit '72325cdb65a321df7755ba214efd9be42ce828d5': Remove extraneous logs.
Diffstat (limited to 'packages')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java10
1 files changed, 5 insertions, 5 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 9014918..7371ce2 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -279,7 +279,7 @@ public class PhoneStatusBar extends BaseStatusBar {
public void onAnimationEnd(Animator animation) {
// double-check to avoid races
if (mStatusBarContents.getAlpha() == 0) {
- Slog.d(TAG, "makeIconsInvisible");
+ if (DEBUG) Slog.d(TAG, "makeIconsInvisible");
mStatusBarContents.setVisibility(View.INVISIBLE);
}
}
@@ -518,7 +518,7 @@ public class PhoneStatusBar extends BaseStatusBar {
mCarrierLabel = (TextView)mStatusBarWindow.findViewById(R.id.carrier_label);
mShowCarrierInPanel = (mCarrierLabel != null);
- Slog.v(TAG, "carrierlabel=" + mCarrierLabel + " show=" + mShowCarrierInPanel);
+ if (DEBUG) Slog.v(TAG, "carrierlabel=" + mCarrierLabel + " show=" + mShowCarrierInPanel);
if (mShowCarrierInPanel) {
mCarrierLabel.setVisibility(mCarrierLabelVisible ? View.VISIBLE : View.INVISIBLE);
@@ -854,7 +854,7 @@ public class PhoneStatusBar extends BaseStatusBar {
}
public void addNotification(IBinder key, StatusBarNotification notification) {
- /* if (DEBUG) */ Slog.d(TAG, "addNotification score=" + notification.score);
+ if (DEBUG) Slog.d(TAG, "addNotification score=" + notification.score);
StatusBarIconView iconView = addNotificationViews(key, notification);
if (iconView == null) return;
@@ -909,7 +909,7 @@ public class PhoneStatusBar extends BaseStatusBar {
awakenDreams();
// not immersive & a full-screen alert should be shown
- Slog.d(TAG, "Notification has fullScreenIntent; sending fullScreenIntent");
+ if (DEBUG) Slog.d(TAG, "Notification has fullScreenIntent; sending fullScreenIntent");
try {
notification.notification.fullScreenIntent.send();
} catch (PendingIntent.CanceledException e) {
@@ -2249,7 +2249,7 @@ public class PhoneStatusBar extends BaseStatusBar {
private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
public void onReceive(Context context, Intent intent) {
- Slog.v(TAG, "onReceive: " + intent);
+ if (DEBUG) Slog.v(TAG, "onReceive: " + intent);
String action = intent.getAction();
if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) {
int flags = CommandQueue.FLAG_EXCLUDE_NONE;