drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove a bunch of logging." into honeycomb

Browse Source
This commit is contained in:
Joe Onorato
2011-01-16 17:01:14 -08:00
committed by Android (Google) Code Review
parent fc28f412b5 f68b500bb0
commit 08a555bac4
10 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java
View File

@ -668,7 +668,8 @@ public class PhoneStatusBarPolicy {
if ((mPhoneState == TelephonyManager.CALL_STATE_IDLE) && isEvdo()){
iconLevel = getEvdoLevel();
if (false) {
Slog.d(TAG, "use Evdo level=" + iconLevel + " to replace Cdma Level=" + getCdmaLevel());
Slog.d(TAG, "use Evdo level=" + iconLevel + " to replace Cdma Level="
+ getCdmaLevel());
}
} else {
iconLevel = getCdmaLevel();

1
packages/SystemUI/src/com/android/systemui/statusbar/policy/AirplaneModeController.java
View File

@ -55,7 +55,6 @@ public class AirplaneModeController extends BroadcastReceiver
}
public void onCheckedChanged(CompoundButton view, boolean checked) {
Slog.d(TAG, "onCheckedChanged checked=" + checked + " mAirplaneMode=" + mAirplaneMode);
if (checked != mAirplaneMode) {
mAirplaneMode = checked;
unsafe(checked);

1
packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java
View File

@ -47,7 +47,6 @@ public class KeyButtonView extends ImageView {
int mRepeat;
Runnable mCheckLongPress = new Runnable() {
public void run() {
Slog.d("KeyButtonView", "longpress");
if (isPressed()) {
mLongPressed = true;
mRepeat++;

5
packages/SystemUI/src/com/android/systemui/statusbar/tablet/HeightReceiver.java
View File

@ -73,12 +73,10 @@ public class HeightReceiver extends BroadcastReceiver {
private void setPlugged(boolean plugged) {
final Resources res = mContext.getResources();
Slog.d(TAG, "plugged=" + plugged);
int height = -1;
if (plugged) {
final DisplayMetrics metrics = new DisplayMetrics();
mWindowManager.getDefaultDisplay().getMetrics(metrics);
Slog.d(TAG, "metrics=" + metrics);
height = metrics.heightPixels - 720;
}
@ -87,7 +85,8 @@ public class HeightReceiver extends BroadcastReceiver {
if (height < minHeight) {
height = minHeight;
}
Slog.d(TAG, "using height=" + height + " old=" + mHeight);
Slog.i(TAG, "Resizing status bar plugged=" + plugged + " height="
+ height + " old=" + mHeight);
mHeight = height;
final int N = mListeners.size();

3
packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java
View File

@ -269,7 +269,8 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel,
// fully closed, no animation necessary
} else if (mVisible) {
if (DEBUG) {
Slog.d(TAG, "panelHeight not zero but trying to open; scheduling an anim to open fully");
Slog.d(TAG, "panelHeight not zero but trying to open; scheduling an anim"
+ " to open fully");
}
startAnimation(true);
}

2
packages/SystemUI/src/com/android/systemui/statusbar/tablet/SettingsView.java
View File

@ -95,7 +95,6 @@ public class SettingsView extends LinearLayout implements View.OnClickListener {
// Network
// ----------------------------
private void onClickNetwork() {
Slog.d(TAG, "onClickNetwork");
getContext().startActivity(new Intent(Settings.ACTION_WIFI_SETTINGS)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
getStatusBarManager().collapse();
@ -104,7 +103,6 @@ public class SettingsView extends LinearLayout implements View.OnClickListener {
// Settings
// ----------------------------
private void onClickSettings() {
Slog.d(TAG, "onClickSettings");
getContext().startActivity(new Intent(Settings.ACTION_SETTINGS)
.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
getStatusBarManager().collapse();

1
packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java
View File

@ -143,7 +143,6 @@ public class ShirtPocket extends ImageView {
hideWindow();
return true;
} else if (action == MotionEvent.ACTION_DOWN) {
Slog.d(TAG, "ACTION_DOWN");
final ClipData clip = mClipping;
if (clip != null) {
final Bitmap icon = clip.getIcon();

16
packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
View File

@ -596,7 +596,7 @@ public class TabletStatusBar extends StatusBar implements
// TODO: immersive mode popups for tablet
} else if (notification.notification.fullScreenIntent != null) {
// not immersive & a full-screen alert should be shown
Slog.d(TAG, "Notification has fullScreenIntent and activity is not immersive;"
Slog.w(TAG, "Notification has fullScreenIntent and activity is not immersive;"
+ " sending fullScreenIntent");
try {
notification.notification.fullScreenIntent.send();
@ -732,28 +732,28 @@ public class TabletStatusBar extends StatusBar implements
// act accordingly
if ((diff & StatusBarManager.DISABLE_CLOCK) != 0) {
boolean show = (state & StatusBarManager.DISABLE_CLOCK) == 0;
Slog.d(TAG, "DISABLE_CLOCK: " + (show ? "no" : "yes"));
Slog.i(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"));
Slog.i(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");
Slog.i(TAG, "DISABLE_EXPAND: yes");
animateCollapse();
}
}
if ((diff & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
if ((state & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) {
Slog.d(TAG, "DISABLE_NOTIFICATION_ICONS: yes");
Slog.i(TAG, "DISABLE_NOTIFICATION_ICONS: yes");
// synchronize with current shadow state
mNotificationIconArea.setVisibility(View.GONE);
mTicker.halt();
} else {
Slog.d(TAG, "DISABLE_NOTIFICATION_ICONS: no");
Slog.i(TAG, "DISABLE_NOTIFICATION_ICONS: no");
// synchronize with current shadow state
mNotificationIconArea.setVisibility(View.VISIBLE);
}
@ -764,11 +764,11 @@ public class TabletStatusBar extends StatusBar implements
}
if ((diff & StatusBarManager.DISABLE_NAVIGATION) != 0) {
if ((state & StatusBarManager.DISABLE_NAVIGATION) != 0) {
Slog.d(TAG, "DISABLE_NAVIGATION: yes");
Slog.i(TAG, "DISABLE_NAVIGATION: yes");
mNavigationArea.setVisibility(View.GONE);
mInputMethodSwitchButton.setScreenLocked(true);
} else {
Slog.d(TAG, "DISABLE_NAVIGATION: no");
Slog.i(TAG, "DISABLE_NAVIGATION: no");
mNavigationArea.setVisibility(View.VISIBLE);
mInputMethodSwitchButton.setScreenLocked(false);
}

4
packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarView.java
View File

@ -65,7 +65,9 @@ public class TabletStatusBarView extends FrameLayout {
}
}
}
Slog.d(TabletStatusBar.TAG, "TabletStatusBarView not intercepting event");
if (TabletStatusBar.DEBUG) {
Slog.d(TabletStatusBar.TAG, "TabletStatusBarView not intercepting event");
}
return super.onInterceptTouchEvent(ev);
}

2
packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java
View File

@ -111,7 +111,6 @@ public class TabletTicker
public void remove(IBinder key, boolean advance) {
if (mCurrentKey == key) {
Slog.d(TAG, "removed current");
// Showing now
if (advance) {
removeMessages(MSG_ADVANCE);
@ -121,7 +120,6 @@ public class TabletTicker
// In the queue
for (int i=0; i<QUEUE_LENGTH; i++) {
if (mKeys[i] == key) {
Slog.d(TAG, "removed from queue: " + i);
for (; i<QUEUE_LENGTH-1; i++) {
mKeys[i] = mKeys[i+1];
mQueue[i] = mQueue[i+1];