diff options
| author | John Spurlock <jspurlock@google.com> | 2013-06-05 10:13:46 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2013-06-06 16:40:56 -0400 |
| commit | cd686b5b6d4166b510df8e32138479a9559bc117 (patch) | |
| tree | f390c7e37bb99aa7ff21add2ebf780d01a0770ba /packages/SystemUI/src/com | |
| parent | c9083f1a6402b7ebf3f570e8af8634d631b48029 (diff) | |
| download | frameworks_base-cd686b5b6d4166b510df8e32138479a9559bc117.zip frameworks_base-cd686b5b6d4166b510df8e32138479a9559bc117.tar.gz frameworks_base-cd686b5b6d4166b510df8e32138479a9559bc117.tar.bz2 | |
Migrate systemui Slog calls to Log
Change-Id: Ib6734c85960f06fed646599565b8eeba26b9e98e
Diffstat (limited to 'packages/SystemUI/src/com')
48 files changed, 286 insertions, 307 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/BootReceiver.java b/packages/SystemUI/src/com/android/systemui/BootReceiver.java index d3ce30d..8e24eeb 100644 --- a/packages/SystemUI/src/com/android/systemui/BootReceiver.java +++ b/packages/SystemUI/src/com/android/systemui/BootReceiver.java @@ -21,7 +21,7 @@ import android.content.ContentResolver; import android.content.Context; import android.content.Intent; import android.provider.Settings; -import android.util.Slog; +import android.util.Log; /** * Performs a number of miscellaneous, non-system-critical actions @@ -40,7 +40,7 @@ public class BootReceiver extends BroadcastReceiver { context.startService(loadavg); } } catch (Exception e) { - Slog.e(TAG, "Can't start load average service", e); + Log.e(TAG, "Can't start load average service", e); } } } diff --git a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java index edfaf49..0019c1b 100644 --- a/packages/SystemUI/src/com/android/systemui/ExpandHelper.java +++ b/packages/SystemUI/src/com/android/systemui/ExpandHelper.java @@ -23,7 +23,7 @@ import android.animation.AnimatorSet; import android.animation.ObjectAnimator; import android.content.Context; import android.os.Vibrator; -import android.util.Slog; +import android.util.Log; import android.view.Gravity; import android.view.MotionEvent; import android.view.ScaleGestureDetector; @@ -113,7 +113,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { = new ScaleGestureDetector.SimpleOnScaleGestureListener() { @Override public boolean onScaleBegin(ScaleGestureDetector detector) { - if (DEBUG_SCALE) Slog.v(TAG, "onscalebegin()"); + if (DEBUG_SCALE) Log.v(TAG, "onscalebegin()"); float focusX = detector.getFocusX(); float focusY = detector.getFocusY(); @@ -126,7 +126,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { @Override public boolean onScale(ScaleGestureDetector detector) { - if (DEBUG_SCALE) Slog.v(TAG, "onscale() on " + mCurrView); + if (DEBUG_SCALE) Log.v(TAG, "onscale() on " + mCurrView); return true; } @@ -143,7 +143,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { mView = v; } public void setHeight(float h) { - if (DEBUG_SCALE) Slog.v(TAG, "SetHeight: setting to " + h); + if (DEBUG_SCALE) Log.v(TAG, "SetHeight: setting to " + h); ViewGroup.LayoutParams lp = mView.getLayoutParams(); lp.height = (int)h; mView.setLayoutParams(lp); @@ -158,7 +158,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { } public int getNaturalHeight(int maximum) { ViewGroup.LayoutParams lp = mView.getLayoutParams(); - if (DEBUG_SCALE) Slog.v(TAG, "Inspecting a child of type: " + + if (DEBUG_SCALE) Log.v(TAG, "Inspecting a child of type: " + mView.getClass().getName()); int oldHeight = lp.height; lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; @@ -230,7 +230,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { } private void updateExpansion() { - if (DEBUG_SCALE) Slog.v(TAG, "updateExpansion()"); + if (DEBUG_SCALE) Log.v(TAG, "updateExpansion()"); // are we scaling or dragging? float span = mSGD.getCurrentSpan() - mInitialTouchSpan; span *= USE_SPAN ? 1f : 0f; @@ -270,10 +270,10 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { } private boolean isInside(View v, float x, float y) { - if (DEBUG) Slog.d(TAG, "isinside (" + x + ", " + y + ")"); + if (DEBUG) Log.d(TAG, "isinside (" + x + ", " + y + ")"); if (v == null) { - if (DEBUG) Slog.d(TAG, "isinside null subject"); + if (DEBUG) Log.d(TAG, "isinside null subject"); return false; } if (mEventSource != null) { @@ -281,14 +281,14 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { mEventSource.getLocationOnScreen(location); x += location[0]; y += location[1]; - if (DEBUG) Slog.d(TAG, " to global (" + x + ", " + y + ")"); + if (DEBUG) Log.d(TAG, " to global (" + x + ", " + y + ")"); } int[] location = new int[2]; v.getLocationOnScreen(location); x -= location[0]; y -= location[1]; - if (DEBUG) Slog.d(TAG, " to local (" + x + ", " + y + ")"); - if (DEBUG) Slog.d(TAG, " inside (" + v.getWidth() + ", " + v.getHeight() + ")"); + if (DEBUG) Log.d(TAG, " to local (" + x + ", " + y + ")"); + if (DEBUG) Log.d(TAG, " inside (" + v.getWidth() + ", " + v.getHeight() + ")"); boolean inside = (x > 0f && y > 0f && x < v.getWidth() & y < v.getHeight()); return inside; } @@ -307,10 +307,10 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { private float calculateGlow(float target, float actual) { // glow if overscale - if (DEBUG_GLOW) Slog.d(TAG, "target: " + target + " actual: " + actual); + if (DEBUG_GLOW) Log.d(TAG, "target: " + target + " actual: " + actual); float stretch = Math.abs((target - actual) / mMaximumStretch); float strength = 1f / (1f + (float) Math.pow(Math.E, -1 * ((8f * stretch) - 5f))); - if (DEBUG_GLOW) Slog.d(TAG, "stretch: " + stretch + " strength: " + strength); + if (DEBUG_GLOW) Log.d(TAG, "stretch: " + stretch + " strength: " + strength); return (GLOW_BASE + strength * (1f - GLOW_BASE)); } @@ -348,7 +348,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { @Override public boolean onInterceptTouchEvent(MotionEvent ev) { final int action = ev.getAction(); - if (DEBUG_SCALE) Slog.d(TAG, "intercept: act=" + MotionEvent.actionToString(action) + + if (DEBUG_SCALE) Log.d(TAG, "intercept: act=" + MotionEvent.actionToString(action) + " expanding=" + mExpanding + (0 != (mExpansionStyle & BLINDS) ? " (blinds)" : "") + (0 != (mExpansionStyle & PULL) ? " (pull)" : "") + @@ -362,7 +362,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { mInitialTouchSpan = mSGD.getCurrentSpan(); mLastFocusY = mInitialTouchFocusY; mLastSpanY = mInitialTouchSpan; - if (DEBUG_SCALE) Slog.d(TAG, "set initial span: " + mInitialTouchSpan); + if (DEBUG_SCALE) Log.d(TAG, "set initial span: " + mInitialTouchSpan); if (mExpanding) { return true; @@ -376,7 +376,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { xspan > mPullGestureMinXSpan && xspan > mSGD.getCurrentSpanY())) { // detect a vertical pulling gesture with fingers somewhat separated - if (DEBUG_SCALE) Slog.v(TAG, "got pull gesture (xspan=" + xspan + "px)"); + if (DEBUG_SCALE) Log.v(TAG, "got pull gesture (xspan=" + xspan + "px)"); final View underFocus = findView(x, y); if (underFocus != null) { @@ -393,7 +393,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { if (mWatchingForPull) { final int yDiff = y - mLastMotionY; if (yDiff > mTouchSlop) { - if (DEBUG) Slog.v(TAG, "got venetian gesture (dy=" + yDiff + "px)"); + if (DEBUG) Log.v(TAG, "got venetian gesture (dy=" + yDiff + "px)"); mLastMotionY = y; final View underFocus = findView(x, y); if (underFocus != null) { @@ -413,7 +413,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { case MotionEvent.ACTION_CANCEL: case MotionEvent.ACTION_UP: - if (DEBUG) Slog.d(TAG, "up/cancel"); + if (DEBUG) Log.d(TAG, "up/cancel"); finishExpanding(false); clearView(); break; @@ -425,7 +425,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { @Override public boolean onTouchEvent(MotionEvent ev) { final int action = ev.getActionMasked(); - if (DEBUG_SCALE) Slog.d(TAG, "touch: act=" + MotionEvent.actionToString(action) + + if (DEBUG_SCALE) Log.d(TAG, "touch: act=" + MotionEvent.actionToString(action) + " expanding=" + mExpanding + (0 != (mExpansionStyle & BLINDS) ? " (blinds)" : "") + (0 != (mExpansionStyle & PULL) ? " (pull)" : "") + @@ -484,14 +484,14 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { case MotionEvent.ACTION_POINTER_UP: case MotionEvent.ACTION_POINTER_DOWN: - if (DEBUG) Slog.d(TAG, "pointer change"); + if (DEBUG) Log.d(TAG, "pointer change"); mInitialTouchY += mSGD.getFocusY() - mLastFocusY; mInitialTouchSpan += mSGD.getCurrentSpan() - mLastSpanY; break; case MotionEvent.ACTION_UP: case MotionEvent.ACTION_CANCEL: - if (DEBUG) Slog.d(TAG, "up/cancel"); + if (DEBUG) Log.d(TAG, "up/cancel"); finishExpanding(false); clearView(); break; @@ -505,20 +505,20 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { return; } mExpanding = true; - if (DEBUG) Slog.d(TAG, "scale type " + expandType + " beginning on view: " + v); + if (DEBUG) Log.d(TAG, "scale type " + expandType + " beginning on view: " + v); mCallback.setUserLockedChild(v, true); setView(v); setGlow(GLOW_BASE); mScaler.setView(v); mOldHeight = mScaler.getHeight(); if (mCallback.canChildBeExpanded(v)) { - if (DEBUG) Slog.d(TAG, "working on an expandable child"); + if (DEBUG) Log.d(TAG, "working on an expandable child"); mNaturalHeight = mScaler.getNaturalHeight(mLargeSize); } else { - if (DEBUG) Slog.d(TAG, "working on a non-expandable child"); + if (DEBUG) Log.d(TAG, "working on a non-expandable child"); mNaturalHeight = mOldHeight; } - if (DEBUG) Slog.d(TAG, "got mOldHeight: " + mOldHeight + + if (DEBUG) Log.d(TAG, "got mOldHeight: " + mOldHeight + " mNaturalHeight: " + mNaturalHeight); v.getParent().requestDisallowInterceptTouchEvent(true); } @@ -526,7 +526,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { private void finishExpanding(boolean force) { if (!mExpanding) return; - if (DEBUG) Slog.d(TAG, "scale in finishing on view: " + mCurrView); + if (DEBUG) Log.d(TAG, "scale in finishing on view: " + mCurrView); float currentHeight = mScaler.getHeight(); float targetHeight = mSmallSize; @@ -552,11 +552,11 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { mExpanding = false; mExpansionStyle = NONE; - if (DEBUG) Slog.d(TAG, "wasClosed is: " + wasClosed); - if (DEBUG) Slog.d(TAG, "currentHeight is: " + currentHeight); - if (DEBUG) Slog.d(TAG, "mSmallSize is: " + mSmallSize); - if (DEBUG) Slog.d(TAG, "targetHeight is: " + targetHeight); - if (DEBUG) Slog.d(TAG, "scale was finished on view: " + mCurrView); + if (DEBUG) Log.d(TAG, "wasClosed is: " + wasClosed); + if (DEBUG) Log.d(TAG, "currentHeight is: " + currentHeight); + if (DEBUG) Log.d(TAG, "mSmallSize is: " + mSmallSize); + if (DEBUG) Log.d(TAG, "targetHeight is: " + targetHeight); + if (DEBUG) Log.d(TAG, "scale was finished on view: " + mCurrView); } private void clearView() { @@ -575,7 +575,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener { String debugLog = "Looking for glows: " + (mCurrViewTopGlow != null ? "found top " : "didn't find top") + (mCurrViewBottomGlow != null ? "found bottom " : "didn't find bottom"); - Slog.v(TAG, debugLog); + Log.v(TAG, debugLog); } } } diff --git a/packages/SystemUI/src/com/android/systemui/SearchPanelView.java b/packages/SystemUI/src/com/android/systemui/SearchPanelView.java index 1f29990..ab11748 100644 --- a/packages/SystemUI/src/com/android/systemui/SearchPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/SearchPanelView.java @@ -32,7 +32,7 @@ import android.os.Vibrator; import android.provider.Settings; import android.util.AttributeSet; import android.util.EventLog; -import android.util.Slog; +import android.util.Log; import android.view.IWindowManager; import android.view.MotionEvent; import android.view.View; @@ -120,7 +120,7 @@ public class SearchPanelView extends FrameLayout implements mContext.startActivityAsUser(intent, opts.toBundle(), new UserHandle(UserHandle.USER_CURRENT)); } catch (ActivityNotFoundException e) { - Slog.w(TAG, "Activity not found for " + intent.getAction()); + Log.w(TAG, "Activity not found for " + intent.getAction()); onAnimationStarted(); } } @@ -186,7 +186,7 @@ public class SearchPanelView extends FrameLayout implements if (component == null || !mGlowPadView.replaceTargetDrawablesIfPresent(component, ASSIST_ICON_METADATA_NAME, com.android.internal.R.drawable.ic_action_assist_generic)) { - if (DEBUG) Slog.v(TAG, "Couldn't grab icon for component " + component); + if (DEBUG) Log.v(TAG, "Couldn't grab icon for component " + component); } } } diff --git a/packages/SystemUI/src/com/android/systemui/SystemUIService.java b/packages/SystemUI/src/com/android/systemui/SystemUIService.java index e1aed82..ebd7fa8 100644 --- a/packages/SystemUI/src/com/android/systemui/SystemUIService.java +++ b/packages/SystemUI/src/com/android/systemui/SystemUIService.java @@ -24,7 +24,7 @@ import android.content.Intent; import android.content.res.Configuration; import android.os.IBinder; import android.os.RemoteException; -import android.util.Slog; +import android.util.Log; import android.view.IWindowManager; import android.view.WindowManagerGlobal; @@ -70,14 +70,14 @@ public class SystemUIService extends Service { ? R.string.config_systemBarComponent : R.string.config_statusBarComponent; } catch (RemoteException e) { - Slog.w(TAG, "Failing checking whether status bar can hide", e); + Log.w(TAG, "Failing checking whether status bar can hide", e); } final int N = SERVICES.length; mServices = new SystemUI[N]; for (int i=0; i<N; i++) { Class cl = chooseClass(SERVICES[i]); - Slog.d(TAG, "loading: " + cl); + Log.d(TAG, "loading: " + cl); try { mServices[i] = (SystemUI)cl.newInstance(); } catch (IllegalAccessException ex) { @@ -86,7 +86,7 @@ public class SystemUIService extends Service { throw new RuntimeException(ex); } mServices[i].mContext = this; - Slog.d(TAG, "running: " + mServices[i]); + Log.d(TAG, "running: " + mServices[i]); mServices[i].start(); } } diff --git a/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java b/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java index 728c913..5b4bb2c 100644 --- a/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java +++ b/packages/SystemUI/src/com/android/systemui/media/RingtonePlayer.java @@ -28,7 +28,7 @@ import android.os.Process; import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; -import android.util.Slog; +import android.util.Log; import com.android.systemui.SystemUI; @@ -60,7 +60,7 @@ public class RingtonePlayer extends SystemUI { try { mAudioService.setRingtonePlayer(mCallback); } catch (RemoteException e) { - Slog.e(TAG, "Problem registering RingtonePlayer: " + e); + Log.e(TAG, "Problem registering RingtonePlayer: " + e); } } @@ -81,7 +81,7 @@ public class RingtonePlayer extends SystemUI { @Override public void binderDied() { - if (LOGD) Slog.d(TAG, "binderDied() token=" + mToken); + if (LOGD) Log.d(TAG, "binderDied() token=" + mToken); synchronized (mClients) { mClients.remove(mToken); } @@ -93,7 +93,7 @@ public class RingtonePlayer extends SystemUI { @Override public void play(IBinder token, Uri uri, int streamType) throws RemoteException { if (LOGD) { - Slog.d(TAG, "play(token=" + token + ", uri=" + uri + ", uid=" + Log.d(TAG, "play(token=" + token + ", uri=" + uri + ", uid=" + Binder.getCallingUid() + ")"); } Client client; @@ -111,7 +111,7 @@ public class RingtonePlayer extends SystemUI { @Override public void stop(IBinder token) { - if (LOGD) Slog.d(TAG, "stop(token=" + token + ")"); + if (LOGD) Log.d(TAG, "stop(token=" + token + ")"); Client client; synchronized (mClients) { client = mClients.remove(token); @@ -124,7 +124,7 @@ public class RingtonePlayer extends SystemUI { @Override public boolean isPlaying(IBinder token) { - if (LOGD) Slog.d(TAG, "isPlaying(token=" + token + ")"); + if (LOGD) Log.d(TAG, "isPlaying(token=" + token + ")"); Client client; synchronized (mClients) { client = mClients.get(token); @@ -138,7 +138,7 @@ public class RingtonePlayer extends SystemUI { @Override public void playAsync(Uri uri, UserHandle user, boolean looping, int streamType) { - if (LOGD) Slog.d(TAG, "playAsync(uri=" + uri + ", user=" + user + ")"); + if (LOGD) Log.d(TAG, "playAsync(uri=" + uri + ", user=" + user + ")"); if (Binder.getCallingUid() != Process.SYSTEM_UID) { throw new SecurityException("Async playback only available from system UID."); } @@ -148,7 +148,7 @@ public class RingtonePlayer extends SystemUI { @Override public void stopAsync() { - if (LOGD) Slog.d(TAG, "stopAsync()"); + if (LOGD) Log.d(TAG, "stopAsync()"); if (Binder.getCallingUid() != Process.SYSTEM_UID) { throw new SecurityException("Async playback only available from system UID."); } diff --git a/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java b/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java index 888b76e..1ac8295 100644 --- a/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java +++ b/packages/SystemUI/src/com/android/systemui/net/NetworkOverLimitActivity.java @@ -32,7 +32,7 @@ import android.net.NetworkTemplate; import android.os.Bundle; import android.os.RemoteException; import android.os.ServiceManager; -import android.util.Slog; +import android.util.Log; import android.view.WindowManager; import com.android.systemui.R; @@ -79,7 +79,7 @@ public class NetworkOverLimitActivity extends Activity { try { policyService.snoozeLimit(template); } catch (RemoteException e) { - Slog.w(TAG, "problem snoozing network policy", e); + Log.w(TAG, "problem snoozing network policy", e); } } diff --git a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java index ccb711a..0d26c57 100644 --- a/packages/SystemUI/src/com/android/systemui/power/PowerUI.java +++ b/packages/SystemUI/src/com/android/systemui/power/PowerUI.java @@ -35,7 +35,7 @@ import android.media.AudioManager; import android.media.Ringtone; import android.media.RingtoneManager; import android.provider.Settings; -import android.util.Slog; +import android.util.Log; import android.view.View; import android.view.WindowManager; import android.widget.TextView; @@ -126,19 +126,19 @@ public class PowerUI extends SystemUI { int bucket = findBatteryLevelBucket(mBatteryLevel); if (DEBUG) { - Slog.d(TAG, "buckets ....." + mLowBatteryAlertCloseLevel + Log.d(TAG, "buckets ....." + mLowBatteryAlertCloseLevel + " .. " + mLowBatteryReminderLevels[0] + " .. " + mLowBatteryReminderLevels[1]); - Slog.d(TAG, "level " + oldBatteryLevel + " --> " + mBatteryLevel); - Slog.d(TAG, "status " + oldBatteryStatus + " --> " + mBatteryStatus); - Slog.d(TAG, "plugType " + oldPlugType + " --> " + mPlugType); - Slog.d(TAG, "invalidCharger " + oldInvalidCharger + " --> " + mInvalidCharger); - Slog.d(TAG, "bucket " + oldBucket + " --> " + bucket); - Slog.d(TAG, "plugged " + oldPlugged + " --> " + plugged); + Log.d(TAG, "level " + oldBatteryLevel + " --> " + mBatteryLevel); + Log.d(TAG, "status " + oldBatteryStatus + " --> " + mBatteryStatus); + Log.d(TAG, "plugType " + oldPlugType + " --> " + mPlugType); + Log.d(TAG, "invalidCharger " + oldInvalidCharger + " --> " + mInvalidCharger); + Log.d(TAG, "bucket " + oldBucket + " --> " + bucket); + Log.d(TAG, "plugged " + oldPlugged + " --> " + plugged); } if (oldInvalidCharger == 0 && mInvalidCharger != 0) { - Slog.d(TAG, "showing invalid charger warning"); + Log.d(TAG, "showing invalid charger warning"); showInvalidChargerDialog(); return; } else if (oldInvalidCharger != 0 && mInvalidCharger == 0) { @@ -164,20 +164,20 @@ public class PowerUI extends SystemUI { showLowBatteryWarning(); } } else { - Slog.w(TAG, "unknown intent: " + intent); + Log.w(TAG, "unknown intent: " + intent); } } }; void dismissLowBatteryWarning() { if (mLowBatteryDialog != null) { - Slog.i(TAG, "closing low battery warning: level=" + mBatteryLevel); + Log.i(TAG, "closing low battery warning: level=" + mBatteryLevel); mLowBatteryDialog.dismiss(); } } void showLowBatteryWarning() { - Slog.i(TAG, + Log.i(TAG, ((mBatteryLevelTextView == null) ? "showing" : "updating") + " low battery warning: level=" + mBatteryLevel + " [" + findBatteryLevelBucket(mBatteryLevel) + "]"); @@ -234,7 +234,7 @@ public class PowerUI extends SystemUI { void playLowBatterySound() { if (DEBUG) { - Slog.i(TAG, "playing low battery sound. WOMP-WOMP!"); + Log.i(TAG, "playing low battery sound. WOMP-WOMP!"); } final ContentResolver cr = mContext.getContentResolver(); @@ -261,7 +261,7 @@ public class PowerUI extends SystemUI { } void showInvalidChargerDialog() { - Slog.d(TAG, "showing invalid charger dialog"); + Log.d(TAG, "showing invalid charger dialog"); dismissLowBatteryWarning(); diff --git a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java index fdeead1..f5471e5 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java +++ b/packages/SystemUI/src/com/android/systemui/settings/BrightnessController.java @@ -30,7 +30,6 @@ import android.os.ServiceManager; import android.os.UserHandle; import android.provider.Settings; import android.provider.Settings.SettingNotFoundException; -import android.util.Slog; import android.view.IWindowManager; import android.widget.CompoundButton; import android.widget.ImageView; diff --git a/packages/SystemUI/src/com/android/systemui/settings/SettingsUI.java b/packages/SystemUI/src/com/android/systemui/settings/SettingsUI.java index 1075a73..3ab2d9b 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/SettingsUI.java +++ b/packages/SystemUI/src/com/android/systemui/settings/SettingsUI.java @@ -26,7 +26,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.os.Handler; import android.os.UserHandle; -import android.util.Slog; +import android.util.Log; import com.android.systemui.SystemUI; @@ -42,7 +42,7 @@ public class SettingsUI extends SystemUI { public void onReceive(Context context, Intent intent) { String action = intent.getAction(); if (action.equals(Intent.ACTION_SHOW_BRIGHTNESS_DIALOG)) { - if (DEBUG) Slog.d(TAG, "showing brightness dialog"); + if (DEBUG) Log.d(TAG, "showing brightness dialog"); if (mBrightnessDialog == null) { mBrightnessDialog = new BrightnessDialog(mContext); @@ -59,7 +59,7 @@ public class SettingsUI extends SystemUI { } } else { - Slog.w(TAG, "unknown intent: " + intent); + Log.w(TAG, "unknown intent: " + intent); } } }; diff --git a/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java b/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java index c7c361c..e0aefca 100644 --- a/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java +++ b/packages/SystemUI/src/com/android/systemui/settings/ToggleSlider.java @@ -21,7 +21,6 @@ import android.content.res.Resources; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; import android.util.AttributeSet; -import android.util.Slog; import android.view.View; import android.widget.CompoundButton; import android.widget.ProgressBar; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java b/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java index 78226c5..9839fe9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/AnimatedImageView.java @@ -20,7 +20,6 @@ import android.content.Context; import android.graphics.drawable.AnimationDrawable; import android.graphics.drawable.Drawable; import android.util.AttributeSet; -import android.util.Slog; import android.view.View; import android.widget.ImageView; import android.widget.RemoteViews.RemoteView; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java index af72936..c96d9c9 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java @@ -62,7 +62,6 @@ import android.provider.Settings; import android.text.TextUtils; import android.util.DisplayMetrics; import android.util.Log; -import android.util.Slog; import android.view.Display; import android.view.IWindowManager; import android.view.LayoutInflater; @@ -168,7 +167,7 @@ public abstract class BaseStatusBar extends SystemUI implements @Override public boolean onClickHandler(View view, PendingIntent pendingIntent, Intent fillInIntent) { if (DEBUG) { - Slog.v(TAG, "Notification click handler invoked for intent: " + pendingIntent); + Log.v(TAG, "Notification click handler invoked for intent: " + pendingIntent); } final boolean isActivity = pendingIntent.isActivity(); if (isActivity) { @@ -259,7 +258,7 @@ public abstract class BaseStatusBar extends SystemUI implements } if (DEBUG) { - Slog.d(TAG, String.format( + Log.d(TAG, String.format( "init: icons=%d disabled=0x%08x lights=0x%08x menu=0x%08x imeButton=0x%08x", iconList.size(), switches[0], @@ -279,7 +278,7 @@ public abstract class BaseStatusBar extends SystemUI implements String action = intent.getAction(); if (Intent.ACTION_USER_SWITCHED.equals(action)) { mCurrentUserId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, -1); - if (true) Slog.v(TAG, "userId " + mCurrentUserId + " is in the house"); + if (true) Log.v(TAG, "userId " + mCurrentUserId + " is in the house"); userSwitched(mCurrentUserId); } }}, filter); @@ -295,7 +294,7 @@ public abstract class BaseStatusBar extends SystemUI implements final int thisUserId = mCurrentUserId; final int notificationUserId = n.getUserId(); if (DEBUG && MULTIUSER_DEBUG) { - Slog.v(TAG, String.format("%s: current userid: %d, notification userid: %d", + Log.v(TAG, String.format("%s: current userid: %d, notification userid: %d", n, thisUserId, notificationUserId)); } return notificationUserId == UserHandle.USER_ALL @@ -348,7 +347,7 @@ public abstract class BaseStatusBar extends SystemUI implements ApplicationInfo info = mContext.getPackageManager().getApplicationInfo(sbn.getPackageName(), 0); version = info.targetSdkVersion; } catch (NameNotFoundException ex) { - Slog.e(TAG, "Failed looking up ApplicationInfo for " + sbn.getPackageName(), ex); + Log.e(TAG, "Failed looking up ApplicationInfo for " + sbn.getPackageName(), ex); } if (version > 0 && version < Build.VERSION_CODES.GINGERBREAD) { content.setBackgroundResource(R.drawable.notification_row_legacy_bg); @@ -643,7 +642,7 @@ public abstract class BaseStatusBar extends SystemUI implements }; protected void preloadRecentTasksList() { - if (DEBUG) Slog.d(TAG, "preloading recents"); + if (DEBUG) Log.d(TAG, "preloading recents"); Intent intent = new Intent(RecentsActivity.PRELOAD_INTENT); intent.setClassName("com.android.systemui", "com.android.systemui.recent.RecentsPreloadReceiver"); @@ -653,7 +652,7 @@ public abstract class BaseStatusBar extends SystemUI implements } protected void cancelPreloadingRecentTasksList() { - if (DEBUG) Slog.d(TAG, "cancel preloading recents"); + if (DEBUG) Log.d(TAG, "cancel preloading recents"); Intent intent = new Intent(RecentsActivity.CANCEL_PRELOAD_INTENT); intent.setClassName("com.android.systemui", "com.android.systemui.recent.RecentsPreloadReceiver"); @@ -667,11 +666,11 @@ public abstract class BaseStatusBar extends SystemUI implements Intent intent; switch (m.what) { case MSG_TOGGLE_RECENTS_PANEL: - if (DEBUG) Slog.d(TAG, "toggle recents panel"); + if (DEBUG) Log.d(TAG, "toggle recents panel"); toggleRecentsActivity(); break; case MSG_CLOSE_RECENTS_PANEL: - if (DEBUG) Slog.d(TAG, "closing recents panel"); + if (DEBUG) Log.d(TAG, "closing recents panel"); intent = new Intent(RecentsActivity.CLOSE_RECENTS_INTENT); intent.setPackage("com.android.systemui"); mContext.sendBroadcastAsUser(intent, new UserHandle(UserHandle.USER_CURRENT)); @@ -683,13 +682,13 @@ public abstract class BaseStatusBar extends SystemUI implements cancelPreloadingRecentTasksList(); break; case MSG_OPEN_SEARCH_PANEL: - if (DEBUG) Slog.d(TAG, "opening search panel"); + if (DEBUG) Log.d(TAG, "opening search panel"); if (mSearchPanelView != null && mSearchPanelView.isAssistantAvailable()) { mSearchPanelView.show(true, true); } break; case MSG_CLOSE_SEARCH_PANEL: - if (DEBUG) Slog.d(TAG, "closing search panel"); + if (DEBUG) Log.d(TAG, "closing search panel"); if (mSearchPanelView != null && mSearchPanelView.isShowing()) { mSearchPanelView.show(false, true); } @@ -776,7 +775,7 @@ public abstract class BaseStatusBar extends SystemUI implements } catch (RuntimeException e) { final String ident = sbn.getPackageName() + "/0x" + Integer.toHexString(sbn.getId()); - Slog.e(TAG, "couldn't inflate view for notification " + ident, e); + Log.e(TAG, "couldn't inflate view for notification " + ident, e); return false; } @@ -855,7 +854,7 @@ public abstract class BaseStatusBar extends SystemUI implements mIntent.send(mContext, 0, overlay); } catch (PendingIntent.CanceledException e) { // the stack trace isn't very helpful here. Just log the exception message. - Slog.w(TAG, "Sending contentIntent failed: " + e); + Log.w(TAG, "Sending contentIntent failed: " + e); } KeyguardManager kgm = @@ -913,7 +912,7 @@ public abstract class BaseStatusBar extends SystemUI implements protected StatusBarNotification removeNotificationViews(IBinder key) { NotificationData.Entry entry = mNotificationData.remove(key); if (entry == null) { - Slog.w(TAG, "removeNotification for unknown key: " + key); + Log.w(TAG, "removeNotification for unknown key: " + key); return null; } // Remove the expanded view. @@ -928,7 +927,7 @@ public abstract class BaseStatusBar extends SystemUI implements protected StatusBarIconView addNotificationViews(IBinder key, StatusBarNotification notification) { if (DEBUG) { - Slog.d(TAG, "addNotificationViews(key=" + key + ", notification=" + notification); + Log.d(TAG, "addNotificationViews(key=" + key + ", notification=" + notification); } // Construct the icon. final StatusBarIconView iconView = new StatusBarIconView(mContext, @@ -957,7 +956,7 @@ public abstract class BaseStatusBar extends SystemUI implements // Add the expanded view and icon. int pos = mNotificationData.add(entry); if (DEBUG) { - Slog.d(TAG, "addNotificationViews: added at " + pos); + Log.d(TAG, "addNotificationViews: added at " + pos); } updateExpansionStates(); updateNotificationIcons(); @@ -970,10 +969,10 @@ public abstract class BaseStatusBar extends SystemUI implements mContext.getResources().getDimensionPixelSize(R.dimen.notification_row_min_height); ViewGroup.LayoutParams lp = entry.row.getLayoutParams(); if (entry.expandable() && expand) { - if (DEBUG) Slog.d(TAG, "setting expanded row height to WRAP_CONTENT"); + if (DEBUG) Log.d(TAG, "setting expanded row height to WRAP_CONTENT"); lp.height = ViewGroup.LayoutParams.WRAP_CONTENT; } else { - if (DEBUG) Slog.d(TAG, "setting collapsed row height to " + rowHeight); + if (DEBUG) Log.d(TAG, "setting collapsed row height to " + rowHeight); lp.height = rowHeight; } entry.row.setLayoutParams(lp); @@ -986,18 +985,18 @@ public abstract class BaseStatusBar extends SystemUI implements NotificationData.Entry entry = mNotificationData.get(i); if (!entry.userLocked()) { if (i == (N-1)) { - if (DEBUG) Slog.d(TAG, "expanding top notification at " + i); + if (DEBUG) Log.d(TAG, "expanding top notification at " + i); expandView(entry, true); } else { if (!entry.userExpanded()) { - if (DEBUG) Slog.d(TAG, "collapsing notification at " + i); + if (DEBUG) Log.d(TAG, "collapsing notification at " + i); expandView(entry, false); } else { - if (DEBUG) Slog.d(TAG, "ignoring user-modified notification at " + i); + if (DEBUG) Log.d(TAG, "ignoring user-modified notification at " + i); } } } else { - if (DEBUG) Slog.d(TAG, "ignoring notification being held by user at " + i); + if (DEBUG) Log.d(TAG, "ignoring notification being held by user at " + i); } } } @@ -1015,11 +1014,11 @@ public abstract class BaseStatusBar extends SystemUI implements } public void updateNotification(IBinder key, StatusBarNotification notification) { - if (DEBUG) Slog.d(TAG, "updateNotification(" + key + " -> " + notification + ")"); + if (DEBUG) Log.d(TAG, "updateNotification(" + key + " -> " + notification + ")"); final NotificationData.Entry oldEntry = mNotificationData.findByKey(key); if (oldEntry == null) { - Slog.w(TAG, "updateNotification for unknown key: " + key); + Log.w(TAG, "updateNotification for unknown key: " + key); return; } @@ -1032,13 +1031,13 @@ public abstract class BaseStatusBar extends SystemUI implements final RemoteViews bigContentView = notification.getNotification().bigContentView; if (DEBUG) { - Slog.d(TAG, "old notification: when=" + oldNotification.getNotification().when + Log.d(TAG, "old notification: when=" + oldNotification.getNotification().when + " ongoing=" + oldNotification.isOngoing() + " expanded=" + oldEntry.expanded + " contentView=" + oldContentView + " bigContentView=" + oldBigContentView + " rowParent=" + oldEntry.row.getParent()); - Slog.d(TAG, "new notification: when=" + notification.getNotification().when + Log.d(TAG, "new notification: when=" + notification.getNotification().when + " ongoing=" + oldNotification.isOngoing() + " contentView=" + contentView + " bigContentView=" + bigContentView); @@ -1071,7 +1070,7 @@ public abstract class BaseStatusBar extends SystemUI implements oldEntry.notification.getNotification().tickerText); boolean isTopAnyway = isTopNotification(rowParent, oldEntry); if (contentsUnchanged && bigContentsUnchanged && (orderUnchanged || isTopAnyway)) { - if (DEBUG) Slog.d(TAG, "reusing notification for key: " + key); + if (DEBUG) Log.d(TAG, "reusing notification for key: " + key); oldEntry.notification = notification; try { // Reapply the RemoteViews @@ -1102,15 +1101,15 @@ public abstract class BaseStatusBar extends SystemUI implements } catch (RuntimeException e) { // It failed to add cleanly. Log, and remove the view from the panel. - Slog.w(TAG, "Couldn't reapply views for package " + contentView.getPackage(), e); + Log.w(TAG, "Couldn't reapply views for package " + contentView.getPackage(), e); removeNotificationViews(key); addNotificationViews(key, notification); } } else { - if (DEBUG) Slog.d(TAG, "not reusing notification for key: " + key); - if (DEBUG) Slog.d(TAG, "contents was " + (contentsUnchanged ? "unchanged" : "changed")); - if (DEBUG) Slog.d(TAG, "order was " + (orderUnchanged ? "unchanged" : "changed")); - if (DEBUG) Slog.d(TAG, "notification is " + (isTopAnyway ? "top" : "not top")); + if (DEBUG) Log.d(TAG, "not reusing notification for key: " + key); + if (DEBUG) Log.d(TAG, "contents was " + (contentsUnchanged ? "unchanged" : "changed")); + if (DEBUG) Log.d(TAG, "order was " + (orderUnchanged ? "unchanged" : "changed")); + if (DEBUG) Log.d(TAG, "notification is " + (isTopAnyway ? "top" : "not top")); final boolean wasExpanded = oldEntry.userExpanded(); removeNotificationViews(key); addNotificationViews(key, notification); @@ -1127,7 +1126,7 @@ public abstract class BaseStatusBar extends SystemUI implements // Is this for you? boolean isForCurrentUser = notificationIsForCurrentUser(notification); - if (DEBUG) Slog.d(TAG, "notification is " + (isForCurrentUser ? "" : "not ") + "for you"); + if (DEBUG) Log.d(TAG, "notification is " + (isForCurrentUser ? "" : "not ") + "for you"); // Restart the ticker if it's still running if (updateTicker && isForCurrentUser) { @@ -1141,11 +1140,11 @@ public abstract class BaseStatusBar extends SystemUI implements // See if we need to update the intruder. if (ENABLE_INTRUDERS && oldNotification == mCurrentlyIntrudingNotification) { - if (DEBUG) Slog.d(TAG, "updating the current intruder:" + notification); + if (DEBUG) Log.d(TAG, "updating the current intruder:" + notification); // XXX: this is a hack for Alarms. The real implementation will need to *update* // the intruder. if (notification.getNotification().fullScreenIntent == null) { // TODO(dsandler): consistent logic with add() - if (DEBUG) Slog.d(TAG, "no longer intrudes!"); + if (DEBUG) Log.d(TAG, "no longer intrudes!"); mHandler.sendEmptyMessage(MSG_HIDE_INTRUDER); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/DoNotDisturb.java b/packages/SystemUI/src/com/android/systemui/statusbar/DoNotDisturb.java index 9e44e71..ce67abe 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/DoNotDisturb.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/DoNotDisturb.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.RemoteException; import android.os.ServiceManager; -import android.util.Slog; import com.android.systemui.statusbar.policy.Prefs; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java index 889e0a1..378061f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/GestureRecorder.java @@ -27,7 +27,7 @@ import java.util.LinkedList; import android.os.Handler; import android.os.Message; import android.os.SystemClock; -import android.util.Slog; +import android.util.Log; import android.view.MotionEvent; /** @@ -101,7 +101,7 @@ public class GestureRecorder { mDownTime = ev.getDownTime(); } else { if (mDownTime != ev.getDownTime()) { - Slog.w(TAG, "Assertion failure in GestureRecorder: event downTime (" + Log.w(TAG, "Assertion failure in GestureRecorder: event downTime (" +ev.getDownTime()+") does not match gesture downTime ("+mDownTime+")"); } } @@ -237,10 +237,10 @@ public class GestureRecorder { mGestures.add(mCurrentGesture); } if (DEBUG) { - Slog.v(TAG, String.format("Wrote %d complete gestures to %s", mLastSaveLen, mLogfile)); + Log.v(TAG, String.format("Wrote %d complete gestures to %s", mLastSaveLen, mLogfile)); } } catch (IOException e) { - Slog.e(TAG, String.format("Couldn't write gestures to %s", mLogfile), e); + Log.e(TAG, String.format("Couldn't write gestures to %s", mLogfile), e); mLastSaveLen = -1; } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java index 46916f7..de7f189 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/SignalClusterView.java @@ -18,7 +18,7 @@ package com.android.systemui.statusbar; import android.content.Context; import android.util.AttributeSet; -import android.util.Slog; +import android.util.Log; import android.view.View; import android.view.ViewGroup; import android.view.accessibility.AccessibilityEvent; @@ -64,7 +64,7 @@ public class SignalClusterView } public void setNetworkController(NetworkController nc) { - if (DEBUG) Slog.d(TAG, "NetworkController=" + nc); + if (DEBUG) Log.d(TAG, "NetworkController=" + nc); mNC = nc; } @@ -185,7 +185,7 @@ public class SignalClusterView mWifiGroup.setVisibility(View.GONE); } - if (DEBUG) Slog.d(TAG, + if (DEBUG) Log.d(TAG, String.format("wifi: %s sig=%d act=%d", (mWifiVisible ? "VISIBLE" : "GONE"), mWifiStrengthId, mWifiActivityId)); @@ -214,7 +214,7 @@ public class SignalClusterView mSpacer.setVisibility(View.GONE); } - if (DEBUG) Slog.d(TAG, + if (DEBUG) Log.d(TAG, String.format("mobile: %s sig=%d act=%d typ=%d", (mMobileVisible ? "VISIBLE" : "GONE"), mMobileStrengthId, mMobileActivityId, mMobileTypeId)); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java index 39d56a4..54c5e2a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/StatusBarIconView.java @@ -27,7 +27,6 @@ import android.graphics.Rect; import android.os.UserHandle; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Slog; import android.util.Log; import android.view.ViewDebug; import android.view.accessibility.AccessibilityEvent; @@ -151,7 +150,7 @@ public class StatusBarIconView extends AnimatedImageView { private boolean updateDrawable(boolean withClear) { Drawable drawable = getIcon(mIcon); if (drawable == null) { - Slog.w(TAG, "No icon for slot " + mSlot); + Log.w(TAG, "No icon for slot " + mSlot); return false; } if (withClear) { @@ -185,7 +184,7 @@ public class StatusBarIconView extends AnimatedImageView { r = context.getPackageManager() .getResourcesForApplicationAsUser(icon.iconPackage, userId); } catch (PackageManager.NameNotFoundException ex) { - Slog.e(TAG, "Icon package not found: " + icon.iconPackage); + Log.e(TAG, "Icon package not found: " + icon.iconPackage); return null; } } else { @@ -199,7 +198,7 @@ public class StatusBarIconView extends AnimatedImageView { try { return r.getDrawable(icon.iconId); } catch (RuntimeException e) { - Slog.w(TAG, "Icon not found in " + Log.w(TAG, "Icon not found in " + (icon.iconPackage != null ? icon.iconId : "<system>") + ": " + Integer.toHexString(icon.iconId)); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CarrierLabel.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CarrierLabel.java index 66494e4..5fa8126 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/CarrierLabel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/CarrierLabel.java @@ -22,7 +22,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.text.TextUtils; import android.util.AttributeSet; -import android.util.Slog; +import android.util.Log; import android.view.View; import android.widget.TextView; @@ -90,7 +90,7 @@ public class CarrierLabel extends TextView { void updateNetworkName(boolean showSpn, String spn, boolean showPlmn, String plmn) { if (false) { - Slog.d("CarrierLabel", "updateNetworkName showSpn=" + showSpn + " spn=" + spn + Log.d("CarrierLabel", "updateNetworkName showSpn=" + showSpn + " spn=" + spn + " showPlmn=" + showPlmn + " plmn=" + plmn); } final String str; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/IconMerger.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/IconMerger.java index 0640282..eae4b7a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/IconMerger.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/IconMerger.java @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.phone; import android.content.Context; import android.os.Handler; import android.util.AttributeSet; -import android.util.Slog; import android.view.View; import android.widget.LinearLayout; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java index fd36da6a..f5867ab 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarView.java @@ -29,7 +29,7 @@ import android.os.Handler; import android.os.Message; import android.os.ServiceManager; import android.util.AttributeSet; -import android.util.Slog; +import android.util.Log; import android.view.animation.AccelerateInterpolator; import android.view.Display; import android.view.MotionEvent; @@ -95,7 +95,7 @@ public class NavigationBarView extends LinearLayout { final int vh = mCurrentView.getHeight(); if (h != vh || w != vw) { - Slog.w(TAG, String.format( + Log.w(TAG, String.format( "*** Invalid layout in navigation bar (%s this=%dx%d cur=%dx%d)", how, w, h, vw, vh)); if (WORKAROUND_INVALID_LAYOUT) { @@ -318,7 +318,7 @@ public class NavigationBarView extends LinearLayout { mLowProfile = lightsOut; - if (DEBUG) Slog.d(TAG, "setting lights " + (lightsOut?"out":"on")); + if (DEBUG) Log.d(TAG, "setting lights " + (lightsOut?"out":"on")); final View navButtons = mCurrentView.findViewById(R.id.nav_buttons); final View lowLights = mCurrentView.findViewById(R.id.lights_out); @@ -361,7 +361,7 @@ public class NavigationBarView extends LinearLayout { if (hide == mHidden) return; mHidden = hide; - Slog.d(TAG, + Log.d(TAG, (hide ? "HIDING" : "SHOWING") + " navigation bar"); // bring up the lights no matter what @@ -402,7 +402,7 @@ public class NavigationBarView extends LinearLayout { setMenuVisibility(mShowMenu, true /* force */); if (DEBUG) { - Slog.d(TAG, "reorient(): rot=" + mDisplay.getRotation()); + Log.d(TAG, "reorient(): rot=" + mDisplay.getRotation()); } setNavigationIconHints(mNavigationIconHints, true); @@ -416,13 +416,13 @@ public class NavigationBarView extends LinearLayout { @Override protected void onSizeChanged(int w, int h, int oldw, int oldh) { - if (DEBUG) Slog.d(TAG, String.format( + if (DEBUG) Log.d(TAG, String.format( "onSizeChanged: (%dx%d) old: (%dx%d)", w, h, oldw, oldh)); final boolean newVertical = w > 0 && h > w; if (newVertical != mVertical) { mVertical = newVertical; - //Slog.v(TAG, String.format("onSizeChanged: h=%d, w=%d, vert=%s", h, w, mVertical?"y":"n")); + //Log.v(TAG, String.format("onSizeChanged: h=%d, w=%d, vert=%s", h, w, mVertical?"y":"n")); reorient(); } @@ -433,7 +433,7 @@ public class NavigationBarView extends LinearLayout { /* @Override protected void onLayout (boolean changed, int left, int top, int right, int bottom) { - if (DEBUG) Slog.d(TAG, String.format( + if (DEBUG) Log.d(TAG, String.format( "onLayout: %s (%d,%d,%d,%d)", changed?"changed":"notchanged", left, top, right, bottom)); super.onLayout(changed, left, top, right, bottom); @@ -443,7 +443,7 @@ public class NavigationBarView extends LinearLayout { // fails, any touch on the display will fix the layout. @Override public boolean onInterceptTouchEvent(MotionEvent ev) { - if (DEBUG) Slog.d(TAG, "onInterceptTouchEvent: " + ev.toString()); + if (DEBUG) Log.d(TAG, "onInterceptTouchEvent: " + ev.toString()); if (ev.getAction() == MotionEvent.ACTION_DOWN) { postCheckForInvalidLayout("touch"); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java index f33dc20..6be6d4d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java @@ -22,7 +22,6 @@ import android.graphics.Canvas; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.util.EventLog; -import android.util.Slog; import android.view.MotionEvent; import android.view.View; import android.view.accessibility.AccessibilityEvent; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java index 565a3f2..91e1aa0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelBar.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import android.content.Context; import android.util.AttributeSet; -import android.util.Slog; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.FrameLayout; @@ -30,7 +30,7 @@ public class PanelBar extends FrameLayout { public static final String TAG = PanelBar.class.getSimpleName(); public static final void LOG(String fmt, Object... args) { if (!DEBUG) return; - Slog.v(TAG, String.format(fmt, args)); + Log.v(TAG, String.format(fmt, args)); } public static final int STATE_CLOSED = 0; @@ -66,7 +66,7 @@ public class PanelBar extends FrameLayout { public void setPanelHolder(PanelHolder ph) { if (ph == null) { - Slog.e(TAG, "setPanelHolder: null PanelHolder", new Throwable()); + Log.e(TAG, "setPanelHolder: null PanelHolder", new Throwable()); return; } ph.setBar(this); @@ -98,7 +98,7 @@ public class PanelBar extends FrameLayout { // Allow subclasses to implement enable/disable semantics if (!panelsEnabled()) { if (event.getAction() == MotionEvent.ACTION_DOWN) { - Slog.v(TAG, String.format("onTouch: all panels disabled, ignoring touch at (%d,%d)", + Log.v(TAG, String.format("onTouch: all panels disabled, ignoring touch at (%d,%d)", (int) event.getX(), (int) event.getY())); } return false; @@ -109,7 +109,7 @@ public class PanelBar extends FrameLayout { final PanelView panel = selectPanelForTouch(event); if (panel == null) { // panel is not there, so we'll eat the gesture - Slog.v(TAG, String.format("onTouch: no panel for touch at (%d,%d)", + Log.v(TAG, String.format("onTouch: no panel for touch at (%d,%d)", (int) event.getX(), (int) event.getY())); mTouchingPanel = null; return true; @@ -119,7 +119,7 @@ public class PanelBar extends FrameLayout { (enabled ? "" : " (disabled)")); if (!enabled) { // panel is disabled, so we'll eat the gesture - Slog.v(TAG, String.format( + Log.v(TAG, String.format( "onTouch: panel (%s) is disabled, ignoring touch at (%d,%d)", panel, (int) event.getX(), (int) event.getY())); mTouchingPanel = null; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java index e351429..70cb94a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PanelView.java @@ -27,7 +27,7 @@ import android.animation.TimeAnimator.TimeListener; import android.content.Context; import android.content.res.Resources; import android.util.AttributeSet; -import android.util.Slog; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.widget.FrameLayout; @@ -42,7 +42,7 @@ public class PanelView extends FrameLayout { public final void LOG(String fmt, Object... args) { if (!DEBUG) return; - Slog.v(TAG, (mViewName != null ? (mViewName + ": ") : "") + String.format(fmt, args)); + Log.v(TAG, (mViewName != null ? (mViewName + ": ") : "") + String.format(fmt, args)); } public static final boolean BRAKES = false; @@ -112,7 +112,7 @@ public class PanelView extends FrameLayout { } public void computeCurrentVelocity(long timebase) { if (FlingTracker.DEBUG) { - Slog.v("FlingTracker", "computing velocities for " + mEventBuf.size() + " events"); + Log.v("FlingTracker", "computing velocities for " + mEventBuf.size() + " events"); } mVX = mVY = 0; MotionEventCopy last = null; @@ -127,7 +127,7 @@ public class PanelView extends FrameLayout { final float dx = (event.x - last.x); final float dy = (event.y - last.y); if (FlingTracker.DEBUG) { - Slog.v("FlingTracker", String.format(" [%d] dx=%.1f dy=%.1f dt=%.0f vx=%.1f vy=%.1f", + Log.v("FlingTracker", String.format(" [%d] dx=%.1f dy=%.1f dt=%.0f vx=%.1f vy=%.1f", i, dx, dy, dt, (dx/dt), @@ -147,7 +147,7 @@ public class PanelView extends FrameLayout { mVY /= totalweight; } else { if (DEBUG_NAN) { - Slog.v("FlingTracker", "computeCurrentVelocity warning: totalweight=0", + Log.v("FlingTracker", "computeCurrentVelocity warning: totalweight=0", new Throwable()); } // so as not to contaminate the velocities with NaN @@ -155,13 +155,13 @@ public class PanelView extends FrameLayout { } if (FlingTracker.DEBUG) { - Slog.v("FlingTracker", "computed: vx=" + mVX + " vy=" + mVY); + Log.v("FlingTracker", "computed: vx=" + mVX + " vy=" + mVY); } } public float getXVelocity() { if (Float.isNaN(mVX)) { if (DEBUG_NAN) { - Slog.v("FlingTracker", "warning: vx=NaN"); + Log.v("FlingTracker", "warning: vx=NaN"); } mVX = 0; } @@ -170,7 +170,7 @@ public class PanelView extends FrameLayout { public float getYVelocity() { if (Float.isNaN(mVY)) { if (DEBUG_NAN) { - Slog.v("FlingTracker", "warning: vx=NaN"); + Log.v("FlingTracker", "warning: vx=NaN"); } mVY = 0; } @@ -307,7 +307,7 @@ public class PanelView extends FrameLayout { post(mStopAnimator); } } else { - Slog.v(TAG, "animationTick called with dtms=" + dtms + "; nothing to do (h=" + Log.v(TAG, "animationTick called with dtms=" + dtms + "; nothing to do (h=" + mExpandedHeight + " v=" + mVel + ")"); } } @@ -547,7 +547,7 @@ public class PanelView extends FrameLayout { if (Float.isNaN(h)) { // If a NaN gets in here, it will freeze the Animators. if (DEBUG_NAN) { - Slog.v(TAG, "setExpandedHeightInternal: warning: h=NaN, using 0 instead", + Log.v(TAG, "setExpandedHeightInternal: warning: h=NaN, using 0 instead", new Throwable()); } h = 0; @@ -586,7 +586,7 @@ public class PanelView extends FrameLayout { if (Float.isNaN(frac)) { // If a NaN gets in here, it will freeze the Animators. if (DEBUG_NAN) { - Slog.v(TAG, "setExpandedFraction: frac=NaN, using 0 instead", + Log.v(TAG, "setExpandedFraction: frac=NaN, using 0 instead", new Throwable()); } frac = 0; 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 978b36b..97c7b98 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java @@ -55,7 +55,6 @@ import android.service.dreams.IDreamManager; import android.util.DisplayMetrics; import android.util.EventLog; import android.util.Log; -import android.util.Slog; import android.view.Display; import android.view.Gravity; import android.view.MotionEvent; @@ -280,7 +279,7 @@ public class PhoneStatusBar extends BaseStatusBar { public void onAnimationEnd(Animator animation) { // double-check to avoid races if (mStatusBarContents.getAlpha() == 0) { - if (DEBUG) Slog.d(TAG, "makeIconsInvisible"); + if (DEBUG) Log.d(TAG, "makeIconsInvisible"); mStatusBarContents.setVisibility(View.INVISIBLE); } } @@ -296,7 +295,7 @@ public class PhoneStatusBar extends BaseStatusBar { Settings.Secure.USER_SETUP_COMPLETE, 0 /*default */, mCurrentUserId); - if (MULTIUSER_DEBUG) Slog.d(TAG, String.format("User setup changed: " + + if (MULTIUSER_DEBUG) Log.d(TAG, String.format("User setup changed: " + "selfChange=%s userSetup=%s mUserSetup=%s", selfChange, userSetup, mUserSetup)); if (mSettingsButton != null && mHasFlipSettings) { @@ -439,7 +438,7 @@ public class PhoneStatusBar extends BaseStatusBar { try { boolean showNav = mWindowManagerService.hasNavigationBar(); - if (DEBUG) Slog.v(TAG, "hasNavigationBar=" + showNav); + if (DEBUG) Log.v(TAG, "hasNavigationBar=" + showNav); if (showNav) { mNavigationBarView = (NavigationBarView) View.inflate(context, R.layout.navigation_bar, null); @@ -566,7 +565,7 @@ public class PhoneStatusBar extends BaseStatusBar { mCarrierLabel = (TextView)mStatusBarWindow.findViewById(R.id.carrier_label); mShowCarrierInPanel = (mCarrierLabel != null); - if (DEBUG) Slog.v(TAG, "carrierlabel=" + mCarrierLabel + " show=" + mShowCarrierInPanel); + if (DEBUG) Log.v(TAG, "carrierlabel=" + mCarrierLabel + " show=" + mShowCarrierInPanel); if (mShowCarrierInPanel) { mCarrierLabel.setVisibility(mCarrierLabelVisible ? View.VISIBLE : View.INVISIBLE); @@ -818,7 +817,7 @@ public class PhoneStatusBar extends BaseStatusBar { // For small-screen devices (read: phones) that lack hardware navigation buttons private void addNavigationBar() { - if (DEBUG) Slog.v(TAG, "addNavigationBar: about to add " + mNavigationBarView); + if (DEBUG) Log.v(TAG, "addNavigationBar: about to add " + mNavigationBarView); if (mNavigationBarView == null) return; prepareNavigationBarView(); @@ -897,7 +896,7 @@ public class PhoneStatusBar extends BaseStatusBar { } public void addIcon(String slot, int index, int viewIndex, StatusBarIcon icon) { - if (SPEW) Slog.d(TAG, "addIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex + if (SPEW) Log.d(TAG, "addIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex + " icon=" + icon); StatusBarIconView view = new StatusBarIconView(mContext, slot, null); view.set(icon); @@ -906,19 +905,19 @@ public class PhoneStatusBar extends BaseStatusBar { public void updateIcon(String slot, int index, int viewIndex, StatusBarIcon old, StatusBarIcon icon) { - if (SPEW) Slog.d(TAG, "updateIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex + if (SPEW) Log.d(TAG, "updateIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex + " old=" + old + " icon=" + icon); StatusBarIconView view = (StatusBarIconView)mStatusIcons.getChildAt(viewIndex); view.set(icon); } public void removeIcon(String slot, int index, int viewIndex) { - if (SPEW) Slog.d(TAG, "removeIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex); + if (SPEW) Log.d(TAG, "removeIcon slot=" + slot + " index=" + index + " viewIndex=" + viewIndex); mStatusIcons.removeViewAt(viewIndex); } public void addNotification(IBinder key, StatusBarNotification notification) { - if (DEBUG) Slog.d(TAG, "addNotification score=" + notification.getScore()); + if (DEBUG) Log.d(TAG, "addNotification score=" + notification.getScore()); StatusBarIconView iconView = addNotificationViews(key, notification); if (iconView == null) return; @@ -926,7 +925,7 @@ public class PhoneStatusBar extends BaseStatusBar { try { immersive = ActivityManagerNative.getDefault().isTopActivityImmersive(); if (DEBUG) { - Slog.d(TAG, "Top activity is " + (immersive?"immersive":"not immersive")); + Log.d(TAG, "Top activity is " + (immersive?"immersive":"not immersive")); } } catch (RemoteException ex) { } @@ -936,12 +935,12 @@ public class PhoneStatusBar extends BaseStatusBar { if (ENABLE_INTRUDERS && ( // TODO(dsandler): Only if the screen is on notification.notification.intruderView != null)) { - Slog.d(TAG, "Presenting high-priority notification"); + Log.d(TAG, "Presenting high-priority notification"); // special new transient ticker mode // 1. Populate mIntruderAlertView if (notification.notification.intruderView == null) { - Slog.e(TAG, notification.notification.toString() + " wanted to intrude but intruderView was null"); + Log.e(TAG, notification.notification.toString() + " wanted to intrude but intruderView was null"); return; } @@ -973,7 +972,7 @@ public class PhoneStatusBar extends BaseStatusBar { awakenDreams(); // not immersive & a full-screen alert should be shown - if (DEBUG) Slog.d(TAG, "Notification has fullScreenIntent; sending fullScreenIntent"); + if (DEBUG) Log.d(TAG, "Notification has fullScreenIntent; sending fullScreenIntent"); try { notification.getNotification().fullScreenIntent.send(); } catch (PendingIntent.CanceledException e) { @@ -994,7 +993,7 @@ public class PhoneStatusBar extends BaseStatusBar { public void removeNotification(IBinder key) { StatusBarNotification old = removeNotificationViews(key); - if (SPEW) Slog.d(TAG, "removeNotification key=" + key + " old=" + old); + if (SPEW) Log.d(TAG, "removeNotification key=" + key + " old=" + old); if (old != null) { // Cancel the ticker if it's still running @@ -1099,7 +1098,7 @@ public class PhoneStatusBar extends BaseStatusBar { int N = mNotificationData.size(); if (DEBUG) { - Slog.d(TAG, "refreshing icons: " + N + " notifications, mNotificationIcons=" + mNotificationIcons); + Log.d(TAG, "refreshing icons: " + N + " notifications, mNotificationIcons=" + mNotificationIcons); } ArrayList<View> toShow = new ArrayList<View>(); @@ -1139,7 +1138,7 @@ public class PhoneStatusBar extends BaseStatusBar { // The idea here is to only show the carrier label when there is enough room to see it, // i.e. when there aren't enough notifications to fill the panel. if (DEBUG) { - Slog.d(TAG, String.format("pileh=%d scrollh=%d carrierh=%d", + Log.d(TAG, String.format("pileh=%d scrollh=%d carrierh=%d", mPile.getHeight(), mScrollView.getHeight(), mCarrierLabelHeight)); } @@ -1152,7 +1151,7 @@ public class PhoneStatusBar extends BaseStatusBar { if (force || mCarrierLabelVisible != makeVisible) { mCarrierLabelVisible = makeVisible; if (DEBUG) { - Slog.d(TAG, "making carrier label " + (makeVisible?"visible":"invisible")); + Log.d(TAG, "making carrier label " + (makeVisible?"visible":"invisible")); } mCarrierLabel.animate().cancel(); if (makeVisible) { @@ -1183,7 +1182,7 @@ public class PhoneStatusBar extends BaseStatusBar { final boolean clearable = any && mNotificationData.hasClearableItems(); if (DEBUG) { - Slog.d(TAG, "setAreThereNotifications: N=" + mNotificationData.size() + Log.d(TAG, "setAreThereNotifications: N=" + mNotificationData.size() + " any=" + any + " clearable=" + clearable); } @@ -1260,7 +1259,7 @@ public class PhoneStatusBar extends BaseStatusBar { mDisabled = state; if (DEBUG) { - Slog.d(TAG, String.format("disable: 0x%08x -> 0x%08x (diff: 0x%08x)", + Log.d(TAG, String.format("disable: 0x%08x -> 0x%08x (diff: 0x%08x)", old, state, diff)); } @@ -1287,7 +1286,7 @@ public class PhoneStatusBar extends BaseStatusBar { flagdbg.append(((state & StatusBarManager.DISABLE_SEARCH) != 0) ? "SEARCH" : "search"); flagdbg.append(((diff & StatusBarManager.DISABLE_SEARCH) != 0) ? "* " : " "); flagdbg.append(">"); - Slog.d(TAG, flagdbg.toString()); + Log.d(TAG, flagdbg.toString()); if ((diff & StatusBarManager.DISABLE_SYSTEM_INFO) != 0) { mSystemIconArea.animate().cancel(); @@ -1410,7 +1409,7 @@ public class PhoneStatusBar extends BaseStatusBar { }; void makeExpandedVisible(boolean revealAfterDraw) { - if (SPEW) Slog.d(TAG, "Make expanded visible: expanded visible=" + mExpandedVisible); + if (SPEW) Log.d(TAG, "Make expanded visible: expanded visible=" + mExpandedVisible); if (mExpandedVisible) { return; } @@ -1449,7 +1448,7 @@ public class PhoneStatusBar extends BaseStatusBar { public void animateCollapsePanels(int flags) { if (SPEW) { - Slog.d(TAG, "animateCollapse():" + Log.d(TAG, "animateCollapse():" + " mExpandedVisible=" + mExpandedVisible + " flags=" + flags); } @@ -1517,7 +1516,7 @@ public class PhoneStatusBar extends BaseStatusBar { @Override public void animateExpandNotificationsPanel() { - if (SPEW) Slog.d(TAG, "animateExpand: mExpandedVisible=" + mExpandedVisible); + if (SPEW) Log.d(TAG, "animateExpand: mExpandedVisible=" + mExpandedVisible); if ((mDisabled & StatusBarManager.DISABLE_EXPAND) != 0) { return ; } @@ -1572,7 +1571,7 @@ public class PhoneStatusBar extends BaseStatusBar { @Override public void animateExpandSettingsPanel() { - if (SPEW) Slog.d(TAG, "animateExpand: mExpandedVisible=" + mExpandedVisible); + if (SPEW) Log.d(TAG, "animateExpand: mExpandedVisible=" + mExpandedVisible); if ((mDisabled & StatusBarManager.DISABLE_EXPAND) != 0) { return; } @@ -1671,7 +1670,7 @@ public class PhoneStatusBar extends BaseStatusBar { } void makeExpandedInvisible() { - if (SPEW) Slog.d(TAG, "makeExpandedInvisible: mExpandedVisible=" + mExpandedVisible + if (SPEW) Log.d(TAG, "makeExpandedInvisible: mExpandedVisible=" + mExpandedVisible + " mExpandedVisible=" + mExpandedVisible); if (!mExpandedVisible) { @@ -1842,11 +1841,11 @@ public class PhoneStatusBar extends BaseStatusBar { } if (SPEW) { - Slog.d(TAG, "Touch: rawY=" + event.getRawY() + " event=" + event + " mDisabled=" + Log.d(TAG, "Touch: rawY=" + event.getRawY() + " event=" + event + " mDisabled=" + mDisabled + " mTracking=" + mTracking); } else if (CHATTY) { if (event.getAction() != MotionEvent.ACTION_MOVE) { - Slog.d(TAG, String.format( + Log.d(TAG, String.format( "panel: %s at (%f, %f) mDisabled=0x%08x", MotionEvent.actionToString(event.getAction()), event.getRawX(), event.getRawY(), mDisabled)); @@ -1896,7 +1895,7 @@ public class PhoneStatusBar extends BaseStatusBar { final int oldVal = mSystemUiVisibility; final int newVal = (oldVal&~mask) | (vis&mask); final int diff = newVal ^ oldVal; - if (DEBUG) Slog.d(TAG, String.format( + if (DEBUG) Log.d(TAG, String.format( "setSystemUiVisibility vis=%s mask=%s oldVal=%s newVal=%s diff=%s", Integer.toHexString(vis), Integer.toHexString(mask), Integer.toHexString(oldVal), Integer.toHexString(newVal), @@ -1959,7 +1958,7 @@ public class PhoneStatusBar extends BaseStatusBar { } private void setHideybarConfirmationVisible(boolean visible) { - if (DEBUG) Slog.d(TAG, "setHideybarConfirmationVisible " + visible); + if (DEBUG) Log.d(TAG, "setHideybarConfirmationVisible " + visible); if (visible && mHideybarConfirmation == null && !mHideybarConfirmationDismissed) { // create the confirmation toast bar with the correct message for this config float widthDp = mCurrentDisplaySize.x / @@ -2016,7 +2015,7 @@ public class PhoneStatusBar extends BaseStatusBar { private void setTransparent(View view, boolean transparent) { float alpha = transparent ? TRANSPARENT_ALPHA : 1; - if (DEBUG) Slog.d(TAG, "Setting " + (view == mStatusBarView ? "status bar" : + if (DEBUG) Log.d(TAG, "Setting " + (view == mStatusBarView ? "status bar" : view == mNavigationBarView ? "navigation bar" : "view") + " alpha to " + alpha); view.setAlpha(alpha); } @@ -2084,7 +2083,7 @@ public class PhoneStatusBar extends BaseStatusBar { public void topAppWindowChanged(boolean showMenu) { if (DEBUG) { - Slog.d(TAG, (showMenu?"showing":"hiding") + " the MENU button"); + Log.d(TAG, (showMenu?"showing":"hiding") + " the MENU button"); } if (mNavigationBarView != null) { mNavigationBarView.setMenuVisibility(showMenu); @@ -2247,7 +2246,7 @@ public class PhoneStatusBar extends BaseStatusBar { mHandler.post(new Runnable() { public void run() { mStatusBarView.getLocationOnScreen(mAbsPos); - Slog.d(TAG, "mStatusBarView: ----- (" + mAbsPos[0] + "," + mAbsPos[1] + Log.d(TAG, "mStatusBarView: ----- (" + mAbsPos[0] + "," + mAbsPos[1] + ") " + mStatusBarView.getWidth() + "x" + getStatusBarHeight()); mStatusBarView.debug(); @@ -2319,7 +2318,7 @@ public class PhoneStatusBar extends BaseStatusBar { @Override public void updateExpandedViewPos(int thingy) { - if (DEBUG) Slog.v(TAG, "updateExpandedViewPos"); + if (DEBUG) Log.v(TAG, "updateExpandedViewPos"); // on larger devices, the notification panel is propped open a bit mNotificationPanel.setMinimumHeight( @@ -2387,7 +2386,7 @@ public class PhoneStatusBar extends BaseStatusBar { @Override public void run() { if (DEBUG) { - Slog.v(TAG, "running post-collapse cleanup"); + Log.v(TAG, "running post-collapse cleanup"); } try { mPile.setViewRemoval(true); @@ -2465,7 +2464,7 @@ public class PhoneStatusBar extends BaseStatusBar { private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() { public void onReceive(Context context, Intent intent) { - if (DEBUG) Slog.v(TAG, "onReceive: " + intent); + if (DEBUG) Log.v(TAG, "onReceive: " + intent); String action = intent.getAction(); if (Intent.ACTION_CLOSE_SYSTEM_DIALOGS.equals(action)) { int flags = CommandQueue.FLAG_EXCLUDE_NONE; @@ -2484,7 +2483,7 @@ public class PhoneStatusBar extends BaseStatusBar { } else if (Intent.ACTION_CONFIGURATION_CHANGED.equals(action)) { if (DEBUG) { - Slog.v(TAG, "configuration changed: " + mContext.getResources().getConfiguration()); + Log.v(TAG, "configuration changed: " + mContext.getResources().getConfiguration()); } mDisplay.getSize(mCurrentDisplaySize); @@ -2521,7 +2520,7 @@ public class PhoneStatusBar extends BaseStatusBar { private void setIntruderAlertVisibility(boolean vis) { if (!ENABLE_INTRUDERS) return; if (DEBUG) { - Slog.v(TAG, (vis ? "showing" : "hiding") + " intruder alert window"); + Log.v(TAG, (vis ? "showing" : "hiding") + " intruder alert window"); } mIntruderAlertView.setVisibility(vis ? View.VISIBLE : View.GONE); } @@ -2572,7 +2571,7 @@ public class PhoneStatusBar extends BaseStatusBar { R.dimen.status_bar_icon_padding); if (newIconHPadding != mIconHPadding || newIconSize != mIconSize) { -// Slog.d(TAG, "size=" + newIconSize + " padding=" + newIconHPadding); +// Log.d(TAG, "size=" + newIconSize + " padding=" + newIconHPadding); mIconHPadding = newIconHPadding; mIconSize = newIconSize; //reloadAllNotificationIcons(); // reload the tray @@ -2617,7 +2616,7 @@ public class PhoneStatusBar extends BaseStatusBar { mNotificationPanelMinHeightFrac = 0f; } - if (false) Slog.v(TAG, "updateResources"); + if (false) Log.v(TAG, "updateResources"); } // @@ -2638,7 +2637,7 @@ public class PhoneStatusBar extends BaseStatusBar { public void run() { vibrate(); SystemClock.sleep(250); - Slog.d(TAG, "startTracing"); + Log.d(TAG, "startTracing"); android.os.Debug.startMethodTracing("/data/statusbar-traces/trace"); mHandler.postDelayed(mStopTracing, 10000); } @@ -2647,7 +2646,7 @@ public class PhoneStatusBar extends BaseStatusBar { Runnable mStopTracing = new Runnable() { public void run() { android.os.Debug.stopMethodTracing(); - Slog.d(TAG, "stopTracing"); + Log.d(TAG, "stopTracing"); vibrate(); } }; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java index 9b8bd22..80734ee 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarPolicy.java @@ -36,7 +36,7 @@ import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.TelephonyManager; -import android.util.Slog; +import android.util.Log; import com.android.internal.telephony.IccCard; import com.android.internal.telephony.IccCardConstants; @@ -284,17 +284,17 @@ public class PhoneStatusBarPolicy { final String action = intent.getAction(); final boolean enabled = intent.getBooleanExtra(TtyIntent.TTY_ENABLED, false); - if (false) Slog.v(TAG, "updateTTY: enabled: " + enabled); + if (false) Log.v(TAG, "updateTTY: enabled: " + enabled); if (enabled) { // TTY is on - if (false) Slog.v(TAG, "updateTTY: set TTY on"); + if (false) Log.v(TAG, "updateTTY: set TTY on"); mService.setIcon("tty", R.drawable.stat_sys_tty_mode, 0, mContext.getString(R.string.accessibility_tty_enabled)); mService.setIconVisibility("tty", true); } else { // TTY is off - if (false) Slog.v(TAG, "updateTTY: set TTY off"); + if (false) Log.v(TAG, "updateTTY: set TTY off"); mService.setIconVisibility("tty", false); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java index de9f750..2a65381 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java @@ -23,7 +23,7 @@ import android.content.res.Resources; import android.content.res.Resources.NotFoundException; import android.util.AttributeSet; import android.util.EventLog; -import android.util.Slog; +import android.util.Log; import android.view.MotionEvent; import android.view.View; import android.view.accessibility.AccessibilityEvent; @@ -128,7 +128,7 @@ public class PhoneStatusBarView extends PanelBar { float region = (w * mSettingsPanelDragzoneFrac); if (DEBUG) { - Slog.v(TAG, String.format( + Log.v(TAG, String.format( "w=%.1f frac=%.3f region=%.1f min=%.1f x=%.1f w-x=%.1f", w, mSettingsPanelDragzoneFrac, region, mSettingsPanelDragzoneMin, x, (w-x))); } @@ -152,7 +152,7 @@ public class PhoneStatusBarView extends PanelBar { // which is kind of tricky to determine mShouldFade = (mFadingPanel == null || mFadingPanel.isFullyExpanded()); if (DEBUG) { - Slog.v(TAG, "start opening: " + panel + " shouldfade=" + mShouldFade); + Log.v(TAG, "start opening: " + panel + " shouldfade=" + mShouldFade); } mFadingPanel = panel; } @@ -202,7 +202,7 @@ public class PhoneStatusBarView extends PanelBar { super.panelExpansionChanged(panel, frac); if (DEBUG) { - Slog.v(TAG, "panelExpansionChanged: f=" + frac); + Log.v(TAG, "panelExpansionChanged: f=" + frac); } if (panel == mFadingPanel && mScrimColor != 0 && ActivityManager.isHighEndGfx()) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrackingPatternView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrackingPatternView.java index d2ed5ff..f3cf65c 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrackingPatternView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/TrackingPatternView.java @@ -19,7 +19,6 @@ package com.android.systemui.statusbar.phone; import android.content.Context; import android.content.res.TypedArray; import android.util.AttributeSet; -import android.util.Slog; import android.view.View; import android.graphics.BitmapFactory; import android.graphics.Bitmap; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AirplaneModeController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AirplaneModeController.java index 3c8276d..71a7aa8 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/AirplaneModeController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/AirplaneModeController.java @@ -26,7 +26,6 @@ import android.os.RemoteException; import android.os.ServiceManager; import android.os.UserHandle; import android.provider.Settings; -import android.util.Slog; import android.widget.CompoundButton; public class AirplaneModeController extends BroadcastReceiver diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java index 716341f..0f56ba6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/BatteryController.java @@ -24,7 +24,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.BatteryManager; -import android.util.Slog; import android.widget.ImageView; import android.widget.TextView; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java index bff6cda..91a1a6d 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/Clock.java @@ -34,7 +34,6 @@ import android.text.style.RelativeSizeSpan; import android.text.style.RelativeSizeSpan; import android.text.style.StyleSpan; import android.util.AttributeSet; -import android.util.Slog; import android.view.View; import android.widget.TextView; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java index 2d951c2..3083e8b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/CompatModeButton.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.res.TypedArray; import android.os.RemoteException; import android.util.AttributeSet; -import android.util.Slog; +import android.util.Log; import android.view.View; import android.widget.ImageView; @@ -55,7 +55,7 @@ public class CompatModeButton extends ImageView { } final boolean vis = (mode != ActivityManager.COMPAT_MODE_NEVER && mode != ActivityManager.COMPAT_MODE_ALWAYS); - if (DEBUG) Slog.d(TAG, "compat mode is " + mode + "; icon will " + (vis ? "show" : "hide")); + if (DEBUG) Log.d(TAG, "compat mode is " + mode + "; icon will " + (vis ? "show" : "hide")); setVisibility(vis ? View.VISIBLE : View.GONE); } } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java index 6eb88be..dca5e41 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java @@ -22,7 +22,7 @@ import android.content.res.TypedArray; import android.graphics.Canvas; import android.os.SystemClock; import android.util.AttributeSet; -import android.util.Slog; +import android.util.Log; import android.view.MotionEvent; import android.view.View; @@ -75,7 +75,7 @@ public class DeadZone extends View { mVertical = (index == VERTICAL); if (DEBUG) - Slog.v(TAG, this + " size=[" + mSizeMin + "-" + mSizeMax + "] hold=" + mHold + Log.v(TAG, this + " size=[" + mSizeMin + "-" + mSizeMax + "] hold=" + mHold + (mVertical ? " vertical" : " horizontal")); setFlashOnTouchCapture(context.getResources().getBoolean(R.bool.config_dead_zone_flash)); @@ -106,7 +106,7 @@ public class DeadZone extends View { @Override public boolean onTouchEvent(MotionEvent event) { if (DEBUG) { - Slog.v(TAG, this + " onTouch: " + MotionEvent.actionToString(event.getAction())); + Log.v(TAG, this + " onTouch: " + MotionEvent.actionToString(event.getAction())); } final int action = event.getAction(); @@ -114,12 +114,12 @@ public class DeadZone extends View { poke(event); } else if (action == MotionEvent.ACTION_DOWN) { if (DEBUG) { - Slog.v(TAG, this + " ACTION_DOWN: " + event.getX() + "," + event.getY()); + Log.v(TAG, this + " ACTION_DOWN: " + event.getX() + "," + event.getY()); } int size = (int) getSize(event.getEventTime()); if ((mVertical && event.getX() < size) || event.getY() < size) { if (CHATTY) { - Slog.v(TAG, "consuming errant click: (" + event.getX() + "," + event.getY() + ")"); + Log.v(TAG, "consuming errant click: (" + event.getX() + "," + event.getY() + ")"); } if (mShouldFlash) { post(mDebugFlash); @@ -134,7 +134,7 @@ public class DeadZone extends View { public void poke(MotionEvent event) { mLastPokeTime = event.getEventTime(); if (DEBUG) - Slog.v(TAG, "poked! size=" + getSize(mLastPokeTime)); + Log.v(TAG, "poked! size=" + getSize(mLastPokeTime)); if (mShouldFlash) postInvalidate(); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DoNotDisturbController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DoNotDisturbController.java index 94c8aa5..d45a94f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DoNotDisturbController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DoNotDisturbController.java @@ -22,7 +22,7 @@ import android.content.SharedPreferences; import android.os.RemoteException; import android.os.ServiceManager; import android.provider.Settings; -import android.util.Slog; +import android.util.Log; import android.view.IWindowManager; import android.widget.CompoundButton; @@ -52,7 +52,7 @@ public class DoNotDisturbController implements CompoundButton.OnCheckedChangeLis // The checkbox is ON for notifications coming in and OFF for Do not disturb, so we // don't have a double negative. public void onCheckedChanged(CompoundButton view, boolean checked) { - //Slog.d(TAG, "onCheckedChanged checked=" + checked + " mDoNotDisturb=" + mDoNotDisturb); + //Log.d(TAG, "onCheckedChanged checked=" + checked + " mDoNotDisturb=" + mDoNotDisturb); final boolean value = !checked; if (value != mDoNotDisturb) { SharedPreferences.Editor editor = Prefs.edit(mContext); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EventHole.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/EventHole.java index 47e758c..4de4241 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/EventHole.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/EventHole.java @@ -25,7 +25,6 @@ import android.os.RemoteException; import android.os.SystemClock; import android.os.ServiceManager; import android.util.AttributeSet; -import android.util.Slog; import android.view.HapticFeedbackConstants; import android.view.IWindowManager; import android.view.InputDevice; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FixedSizeDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FixedSizeDrawable.java index 0e8095c..3751399 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/FixedSizeDrawable.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/FixedSizeDrawable.java @@ -20,7 +20,6 @@ import android.graphics.drawable.Drawable; import android.graphics.Canvas; import android.graphics.ColorFilter; import android.graphics.Rect; -import android.util.Slog; public class FixedSizeDrawable extends Drawable { Drawable mDrawable; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/IntruderAlertView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/IntruderAlertView.java index ee5c863..9b96384 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/IntruderAlertView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/IntruderAlertView.java @@ -28,7 +28,6 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.util.AttributeSet; import android.util.Log; -import android.util.Slog; import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; @@ -102,7 +101,7 @@ public class IntruderAlertView extends LinearLayout implements SwipeHelper.Callb } public void onChildDismissed(View v) { - Slog.v(TAG, "User swiped intruder to dismiss"); + Log.v(TAG, "User swiped intruder to dismiss"); mBar.dismissIntruder(); } @@ -134,7 +133,7 @@ public class IntruderAlertView extends LinearLayout implements SwipeHelper.Callb public void onDraw(android.graphics.Canvas c) { super.onDraw(c); if (DEBUG) { - //Slog.d(TAG, "onDraw: canvas height: " + c.getHeight() + "px; measured height: " + //Log.d(TAG, "onDraw: canvas height: " + c.getHeight() + "px; measured height: " // + getMeasuredHeight() + "px"); c.save(); c.clipRect(6, 6, c.getWidth() - 6, getMeasuredHeight() - 6, @@ -146,7 +145,7 @@ public class IntruderAlertView extends LinearLayout implements SwipeHelper.Callb public void applyIntruderContent(RemoteViews intruderView, OnClickListener listener) { if (DEBUG) { - Slog.v(TAG, "applyIntruderContent: view=" + intruderView + " listener=" + listener); + Log.v(TAG, "applyIntruderContent: view=" + intruderView + " listener=" + listener); } mIntruderRemoteViews = intruderView; mOnClickListener = listener; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java index 82d6a99..db0e4c3 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyButtonView.java @@ -61,7 +61,7 @@ public class KeyButtonView extends ImageView { Runnable mCheckLongPress = new Runnable() { public void run() { if (isPressed()) { - // Slog.d("KeyButtonView", "longpressed: " + this); + // Log.d("KeyButtonView", "longpressed: " + this); if (mCode != 0) { sendEvent(KeyEvent.ACTION_DOWN, KeyEvent.FLAG_LONG_PRESS); sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_LONG_CLICKED); @@ -213,7 +213,7 @@ public class KeyButtonView extends ImageView { switch (action) { case MotionEvent.ACTION_DOWN: - //Slog.d("KeyButtonView", "press"); + //Log.d("KeyButtonView", "press"); mDownTime = SystemClock.uptimeMillis(); setPressed(true); if (mCode != 0) { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java index 3619587..57c347b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NetworkController.java @@ -37,7 +37,7 @@ import android.telephony.PhoneStateListener; import android.telephony.ServiceState; import android.telephony.SignalStrength; import android.telephony.TelephonyManager; -import android.util.Slog; +import android.util.Log; import android.view.View; import android.widget.ImageView; import android.widget.TextView; @@ -429,7 +429,7 @@ public class NetworkController extends BroadcastReceiver { @Override public void onSignalStrengthsChanged(SignalStrength signalStrength) { if (DEBUG) { - Slog.d(TAG, "onSignalStrengthsChanged signalStrength=" + signalStrength + + Log.d(TAG, "onSignalStrengthsChanged signalStrength=" + signalStrength + ((signalStrength == null) ? "" : (" level=" + signalStrength.getLevel()))); } mSignalStrength = signalStrength; @@ -440,7 +440,7 @@ public class NetworkController extends BroadcastReceiver { @Override public void onServiceStateChanged(ServiceState state) { if (DEBUG) { - Slog.d(TAG, "onServiceStateChanged state=" + state.getState()); + Log.d(TAG, "onServiceStateChanged state=" + state.getState()); } mServiceState = state; updateTelephonySignalStrength(); @@ -452,7 +452,7 @@ public class NetworkController extends BroadcastReceiver { @Override public void onCallStateChanged(int state, String incomingNumber) { if (DEBUG) { - Slog.d(TAG, "onCallStateChanged state=" + state); + Log.d(TAG, "onCallStateChanged state=" + state); } // In cdma, if a voice call is made, RSSI should switch to 1x. if (isCdma()) { @@ -464,7 +464,7 @@ public class NetworkController extends BroadcastReceiver { @Override public void onDataConnectionStateChanged(int state, int networkType) { if (DEBUG) { - Slog.d(TAG, "onDataConnectionStateChanged: state=" + state + Log.d(TAG, "onDataConnectionStateChanged: state=" + state + " type=" + networkType); } mDataState = state; @@ -477,7 +477,7 @@ public class NetworkController extends BroadcastReceiver { @Override public void onDataActivity(int direction) { if (DEBUG) { - Slog.d(TAG, "onDataActivity: direction=" + direction); + Log.d(TAG, "onDataActivity: direction=" + direction); } mDataActivity = direction; updateDataIcon(); @@ -539,13 +539,13 @@ public class NetworkController extends BroadcastReceiver { private final void updateTelephonySignalStrength() { if (!hasService()) { - if (CHATTY) Slog.d(TAG, "updateTelephonySignalStrength: !hasService()"); + if (CHATTY) Log.d(TAG, "updateTelephonySignalStrength: !hasService()"); mPhoneSignalIconId = R.drawable.stat_sys_signal_null; mQSPhoneSignalIconId = R.drawable.ic_qs_signal_no_signal; mDataSignalIconId = R.drawable.stat_sys_signal_null; } else { if (mSignalStrength == null) { - if (CHATTY) Slog.d(TAG, "updateTelephonySignalStrength: mSignalStrength == null"); + if (CHATTY) Log.d(TAG, "updateTelephonySignalStrength: mSignalStrength == null"); mPhoneSignalIconId = R.drawable.stat_sys_signal_null; mQSPhoneSignalIconId = R.drawable.ic_qs_signal_no_signal; mDataSignalIconId = R.drawable.stat_sys_signal_null; @@ -556,7 +556,7 @@ public class NetworkController extends BroadcastReceiver { int[] iconList; if (isCdma() && mAlwaysShowCdmaRssi) { mLastSignalLevel = iconLevel = mSignalStrength.getCdmaLevel(); - if(DEBUG) Slog.d(TAG, "mAlwaysShowCdmaRssi=" + mAlwaysShowCdmaRssi + if(DEBUG) Log.d(TAG, "mAlwaysShowCdmaRssi=" + mAlwaysShowCdmaRssi + " set to cdmaLevel=" + mSignalStrength.getCdmaLevel() + " instead of level=" + mSignalStrength.getLevel()); } else { @@ -798,7 +798,7 @@ public class NetworkController extends BroadcastReceiver { void updateNetworkName(boolean showSpn, String spn, boolean showPlmn, String plmn) { if (false) { - Slog.d("CarrierLabel", "updateNetworkName showSpn=" + showSpn + " spn=" + spn + Log.d("CarrierLabel", "updateNetworkName showSpn=" + showSpn + " spn=" + spn + " showPlmn=" + showPlmn + " plmn=" + plmn); } StringBuilder str = new StringBuilder(); @@ -832,7 +832,7 @@ public class NetworkController extends BroadcastReceiver { mWifiChannel.sendMessage(Message.obtain(this, AsyncChannel.CMD_CHANNEL_FULL_CONNECTION)); } else { - Slog.e(TAG, "Failed to connect to wifi"); + Log.e(TAG, "Failed to connect to wifi"); } break; case WifiManager.DATA_ACTIVITY_NOTIFICATION: @@ -964,7 +964,7 @@ public class NetworkController extends BroadcastReceiver { private void updateConnectivity(Intent intent) { if (CHATTY) { - Slog.d(TAG, "updateConnectivity: intent=" + intent); + Log.d(TAG, "updateConnectivity: intent=" + intent); } final ConnectivityManager connManager = (ConnectivityManager) mContext @@ -984,8 +984,8 @@ public class NetworkController extends BroadcastReceiver { int connectionStatus = intent.getIntExtra(ConnectivityManager.EXTRA_INET_CONDITION, 0); if (CHATTY) { - Slog.d(TAG, "updateConnectivity: networkInfo=" + info); - Slog.d(TAG, "updateConnectivity: connectionStatus=" + connectionStatus); + Log.d(TAG, "updateConnectivity: networkInfo=" + info); + Log.d(TAG, "updateConnectivity: connectionStatus=" + connectionStatus); } mInetCondition = (connectionStatus > INET_CONDITION_THRESHOLD ? 1 : 0); @@ -1173,7 +1173,7 @@ public class NetworkController extends BroadcastReceiver { } if (DEBUG) { - Slog.d(TAG, "refreshViews connected={" + Log.d(TAG, "refreshViews connected={" + (mWifiConnected?" wifi":"") + (mDataConnected?" data":"") + " } level=" @@ -1312,7 +1312,7 @@ public class NetworkController extends BroadcastReceiver { // the data direction overlay if (mLastDataDirectionOverlayIconId != combinedActivityIconId) { if (DEBUG) { - Slog.d(TAG, "changing data overlay icon id to " + combinedActivityIconId); + Log.d(TAG, "changing data overlay icon id to " + combinedActivityIconId); } mLastDataDirectionOverlayIconId = combinedActivityIconId; N = mDataDirectionOverlayIconViews.size(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java index 89eed1b..9bf1c1b 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/NotificationRowLayout.java @@ -27,7 +27,6 @@ import android.content.res.TypedArray; import android.graphics.Rect; import android.util.AttributeSet; import android.util.Log; -import android.util.Slog; import android.view.MotionEvent; import android.view.View; import android.view.ViewConfiguration; @@ -87,11 +86,11 @@ public class NotificationRowLayout setOnHierarchyChangeListener(new ViewGroup.OnHierarchyChangeListener() { @Override public void onChildViewAdded(View parent, View child) { - Slog.d(TAG, "view added: " + child + "; new count: " + getChildCount()); + Log.d(TAG, "view added: " + child + "; new count: " + getChildCount()); } @Override public void onChildViewRemoved(View parent, View child) { - Slog.d(TAG, "view removed: " + child + "; new count: " + (getChildCount() - 1)); + Log.d(TAG, "view removed: " + child + "; new count: " + (getChildCount() - 1)); } }); @@ -167,7 +166,7 @@ public class NotificationRowLayout } public void onChildDismissed(View v) { - if (DEBUG) Slog.v(TAG, "onChildDismissed: " + v + " mRemoveViews=" + mRemoveViews); + if (DEBUG) Log.v(TAG, "onChildDismissed: " + v + " mRemoveViews=" + mRemoveViews); final View veto = v.findViewById(R.id.veto); if (veto != null && veto.getVisibility() != View.GONE && mRemoveViews) { veto.performClick(); @@ -231,7 +230,7 @@ public class NotificationRowLayout * get removed properly. */ public void setViewRemoval(boolean removeViews) { - if (DEBUG) Slog.v(TAG, "setViewRemoval: " + removeViews); + if (DEBUG) Log.v(TAG, "setViewRemoval: " + removeViews); mRemoveViews = removeViews; } @@ -266,7 +265,7 @@ public class NotificationRowLayout super.onDraw(c); if (DEBUG) logLayoutTransition(); if (DEBUG) { - //Slog.d(TAG, "onDraw: canvas height: " + c.getHeight() + "px; measured height: " + //Log.d(TAG, "onDraw: canvas height: " + c.getHeight() + "px; measured height: " // + getMeasuredHeight() + "px"); c.save(); c.clipRect(6, 6, c.getWidth() - 6, getMeasuredHeight() - 6, diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/VolumeController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/VolumeController.java index 70f9ac8..3e138d5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/VolumeController.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/VolumeController.java @@ -23,7 +23,6 @@ import android.os.ServiceManager; import android.os.Vibrator; import android.media.AudioManager; import android.provider.Settings; -import android.util.Slog; import android.view.IWindowManager; import android.widget.CompoundButton; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/CompatModePanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/CompatModePanel.java index 8c4ae19..080cbd5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/CompatModePanel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/CompatModePanel.java @@ -21,7 +21,6 @@ import android.content.Context; import android.content.res.TypedArray; import android.os.RemoteException; import android.util.AttributeSet; -import android.util.Slog; import android.view.MotionEvent; import android.view.View; import android.widget.FrameLayout; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationIconArea.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationIconArea.java index 3d6c1a2..4f3c4d5 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationIconArea.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationIconArea.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.res.Resources; import android.os.Handler; import android.util.AttributeSet; -import android.util.Slog; import android.view.View; import android.widget.LinearLayout; import android.widget.RelativeLayout; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationLinearLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationLinearLayout.java index 9ecb2e4..51980dd 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationLinearLayout.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationLinearLayout.java @@ -26,7 +26,6 @@ import android.graphics.Canvas; import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.util.AttributeSet; -import android.util.Slog; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java index 87fc6fc..585c067 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/NotificationPanel.java @@ -23,7 +23,7 @@ import android.animation.ObjectAnimator; import android.content.Context; import android.graphics.Rect; import android.util.AttributeSet; -import android.util.Slog; +import android.util.Log; import android.view.Gravity; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -224,7 +224,7 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, protected void onLayout(boolean changed, int l, int t, int r, int b) { super.onLayout(changed, l, t, r, b); - if (DEBUG) Slog.d(TAG, String.format("PANEL: onLayout: (%d, %d, %d, %d)", l, t, r, b)); + if (DEBUG) Log.d(TAG, String.format("PANEL: onLayout: (%d, %d, %d, %d)", l, t, r, b)); } @Override @@ -232,7 +232,7 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, super.onSizeChanged(w, h, oldw, oldh); if (DEBUG) { - Slog.d(TAG, String.format("PANEL: onSizeChanged: (%d -> %d, %d -> %d)", + Log.d(TAG, String.format("PANEL: onSizeChanged: (%d -> %d, %d -> %d)", oldw, w, oldh, h)); } } @@ -390,7 +390,7 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, } void startAnimation(boolean appearing) { - if (DEBUG) Slog.d(TAG, "startAnimation(appearing=" + appearing + ")"); + if (DEBUG) Log.d(TAG, "startAnimation(appearing=" + appearing + ")"); createAnimation(appearing); mContentAnim.start(); @@ -402,11 +402,11 @@ public class NotificationPanel extends RelativeLayout implements StatusBarPanel, } public void onAnimationCancel(Animator animation) { - if (DEBUG) Slog.d(TAG, "onAnimationCancel"); + if (DEBUG) Log.d(TAG, "onAnimationCancel"); } public void onAnimationEnd(Animator animation) { - if (DEBUG) Slog.d(TAG, "onAnimationEnd"); + if (DEBUG) Log.d(TAG, "onAnimationEnd"); if (! mVisible) { setVisibility(View.GONE); } diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java index 2924cc9..48486b2 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/ShirtPocket.java @@ -28,7 +28,7 @@ import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.Point; import android.util.AttributeSet; -import android.util.Slog; +import android.util.Log; import android.view.DragEvent; import android.view.Gravity; import android.view.MotionEvent; @@ -96,21 +96,21 @@ public class ShirtPocket extends ImageView { @Override public boolean onDragEvent(DragEvent event) { - if (DEBUG) Slog.d(TAG, "onDragEvent: " + event); + if (DEBUG) Log.d(TAG, "onDragEvent: " + event); switch (event.getAction()) { // We want to appear whenever a potential drag takes off from anywhere in the UI. case DragEvent.ACTION_DRAG_STARTED: show(true); break; case DragEvent.ACTION_DRAG_ENTERED: - if (DEBUG) Slog.d(TAG, "entered!"); + if (DEBUG) Log.d(TAG, "entered!"); // XXX: TODO break; case DragEvent.ACTION_DRAG_EXITED: - if (DEBUG) Slog.d(TAG, "exited!"); + if (DEBUG) Log.d(TAG, "exited!"); break; case DragEvent.ACTION_DROP: - if (DEBUG) Slog.d(TAG, "dropped!"); + if (DEBUG) Log.d(TAG, "dropped!"); mPocket.stash(event.getClipData()); break; case DragEvent.ACTION_DRAG_ENDED: 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 bfa1b63..c2054d0 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java @@ -40,7 +40,7 @@ import android.os.IBinder; import android.os.Message; import android.os.RemoteException; import android.text.TextUtils; -import android.util.Slog; +import android.util.Log; import android.view.Display; import android.view.Gravity; import android.view.KeyEvent; @@ -427,7 +427,7 @@ public class TabletStatusBar extends BaseStatusBar implements } if (newIconHPadding != mIconHPadding || newIconSize != mIconSize) { -// Slog.d(TAG, "size=" + newIconSize + " padding=" + newIconHPadding); +// Log.d(TAG, "size=" + newIconSize + " padding=" + newIconHPadding); mIconHPadding = newIconHPadding; mIconSize = newIconSize; reloadAllNotificationIcons(); // reload the tray @@ -436,7 +436,7 @@ public class TabletStatusBar extends BaseStatusBar implements final int numIcons = res.getInteger(R.integer.config_maxNotificationIcons); if (numIcons != mMaxNotificationIcons) { mMaxNotificationIcons = numIcons; - if (DEBUG) Slog.d(TAG, "max notification icons: " + mMaxNotificationIcons); + if (DEBUG) Log.d(TAG, "max notification icons: " + mMaxNotificationIcons); reloadAllNotificationIcons(); } } @@ -461,7 +461,7 @@ public class TabletStatusBar extends BaseStatusBar implements // Sanity-check that someone hasn't set up the config wrong and asked for a navigation // bar on a tablet that has only the system bar if (mWindowManagerService.hasNavigationBar()) { - Slog.e(TAG, "Tablet device cannot show navigation bar and system bar"); + Log.e(TAG, "Tablet device cannot show navigation bar and system bar"); } } catch (RemoteException ex) { } @@ -711,7 +711,7 @@ public class TabletStatusBar extends BaseStatusBar implements super.handleMessage(m); switch (m.what) { case MSG_OPEN_NOTIFICATION_PEEK: - if (DEBUG) Slog.d(TAG, "opening notification peek window; arg=" + m.arg1); + if (DEBUG) Log.d(TAG, "opening notification peek window; arg=" + m.arg1); if (m.arg1 >= 0) { final int N = mNotificationData.size(); @@ -727,7 +727,7 @@ public class TabletStatusBar extends BaseStatusBar implements final int peekIndex = m.arg1; if (peekIndex < N) { - //Slog.d(TAG, "loading peek: " + peekIndex); + //Log.d(TAG, "loading peek: " + peekIndex); NotificationData.Entry entry = mNotificationDNDMode ? mNotificationDNDDummyEntry @@ -769,7 +769,7 @@ public class TabletStatusBar extends BaseStatusBar implements } break; case MSG_CLOSE_NOTIFICATION_PEEK: - if (DEBUG) Slog.d(TAG, "closing notification peek window"); + if (DEBUG) Log.d(TAG, "closing notification peek window"); mNotificationPeekWindow.setVisibility(View.GONE); mNotificationPeekRow.removeAllViews(); @@ -786,7 +786,7 @@ public class TabletStatusBar extends BaseStatusBar implements mNotificationPeekKey = null; break; case MSG_OPEN_NOTIFICATION_PANEL: - if (DEBUG) Slog.d(TAG, "opening notifications panel"); + if (DEBUG) Log.d(TAG, "opening notifications panel"); if (!mNotificationPanel.isShowing()) { mNotificationPanel.show(true, true); mNotificationArea.setVisibility(View.INVISIBLE); @@ -794,37 +794,37 @@ public class TabletStatusBar extends BaseStatusBar implements } break; case MSG_CLOSE_NOTIFICATION_PANEL: - if (DEBUG) Slog.d(TAG, "closing notifications panel"); + if (DEBUG) Log.d(TAG, "closing notifications panel"); if (mNotificationPanel.isShowing()) { mNotificationPanel.show(false, true); mNotificationArea.setVisibility(View.VISIBLE); } break; case MSG_OPEN_INPUT_METHODS_PANEL: - if (DEBUG) Slog.d(TAG, "opening input methods panel"); + if (DEBUG) Log.d(TAG, "opening input methods panel"); if (mInputMethodsPanel != null) mInputMethodsPanel.openPanel(); break; case MSG_CLOSE_INPUT_METHODS_PANEL: - if (DEBUG) Slog.d(TAG, "closing input methods panel"); + if (DEBUG) Log.d(TAG, "closing input methods panel"); if (mInputMethodsPanel != null) mInputMethodsPanel.closePanel(false); break; case MSG_OPEN_COMPAT_MODE_PANEL: - if (DEBUG) Slog.d(TAG, "opening compat panel"); + if (DEBUG) Log.d(TAG, "opening compat panel"); if (mCompatModePanel != null) mCompatModePanel.openPanel(); break; case MSG_CLOSE_COMPAT_MODE_PANEL: - if (DEBUG) Slog.d(TAG, "closing compat panel"); + if (DEBUG) Log.d(TAG, "closing compat panel"); if (mCompatModePanel != null) mCompatModePanel.closePanel(); break; case MSG_SHOW_CHROME: - if (DEBUG) Slog.d(TAG, "hiding shadows (lights on)"); + if (DEBUG) Log.d(TAG, "hiding shadows (lights on)"); mBarContents.setVisibility(View.VISIBLE); mShadow.setVisibility(View.GONE); mSystemUiVisibility &= ~View.SYSTEM_UI_FLAG_LOW_PROFILE; notifyUiVisibilityChanged(); break; case MSG_HIDE_CHROME: - if (DEBUG) Slog.d(TAG, "showing shadows (lights out)"); + if (DEBUG) Log.d(TAG, "showing shadows (lights out)"); animateCollapsePanels(); visibilityChanged(false); mBarContents.setVisibility(View.GONE); @@ -840,20 +840,20 @@ public class TabletStatusBar extends BaseStatusBar implements } public void addIcon(String slot, int index, int viewIndex, StatusBarIcon icon) { - if (DEBUG) Slog.d(TAG, "addIcon(" + slot + ") -> " + icon); + if (DEBUG) Log.d(TAG, "addIcon(" + slot + ") -> " + icon); } public void updateIcon(String slot, int index, int viewIndex, StatusBarIcon old, StatusBarIcon icon) { - if (DEBUG) Slog.d(TAG, "updateIcon(" + slot + ") -> " + icon); + if (DEBUG) Log.d(TAG, "updateIcon(" + slot + ") -> " + icon); } public void removeIcon(String slot, int index, int viewIndex) { - if (DEBUG) Slog.d(TAG, "removeIcon(" + slot + ")"); + if (DEBUG) Log.d(TAG, "removeIcon(" + slot + ")"); } public void addNotification(IBinder key, StatusBarNotification notification) { - if (DEBUG) Slog.d(TAG, "addNotification(" + key + " -> " + notification + ")"); + if (DEBUG) Log.d(TAG, "addNotification(" + key + " -> " + notification + ")"); addNotificationViews(key, notification); final boolean immersive = isImmersive(); @@ -861,7 +861,7 @@ public class TabletStatusBar extends BaseStatusBar implements // TODO: immersive mode popups for tablet } else if (notification.getNotification().fullScreenIntent != null) { // not immersive & a full-screen alert should be shown - Slog.w(TAG, "Notification has fullScreenIntent and activity is not immersive;" + Log.w(TAG, "Notification has fullScreenIntent and activity is not immersive;" + " sending fullScreenIntent"); try { notification.getNotification().fullScreenIntent.send(); @@ -875,7 +875,7 @@ public class TabletStatusBar extends BaseStatusBar implements } public void removeNotification(IBinder key) { - if (DEBUG) Slog.d(TAG, "removeNotification(" + key + ")"); + if (DEBUG) Log.d(TAG, "removeNotification(" + key + ")"); removeNotificationViews(key); mTicker.remove(key); setAreThereNotifications(); @@ -900,17 +900,17 @@ public class TabletStatusBar extends BaseStatusBar implements // act accordingly if ((diff & StatusBarManager.DISABLE_CLOCK) != 0) { boolean show = (state & StatusBarManager.DISABLE_CLOCK) == 0; - Slog.i(TAG, "DISABLE_CLOCK: " + (show ? "no" : "yes")); + Log.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.i(TAG, "DISABLE_SYSTEM_INFO: " + (show ? "no" : "yes")); + Log.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.i(TAG, "DISABLE_EXPAND: yes"); + Log.i(TAG, "DISABLE_EXPAND: yes"); animateCollapsePanels(); visibilityChanged(false); } @@ -920,10 +920,10 @@ public class TabletStatusBar extends BaseStatusBar implements .getBoolean(Prefs.DO_NOT_DISTURB_PREF, Prefs.DO_NOT_DISTURB_DEFAULT); if ((state & StatusBarManager.DISABLE_NOTIFICATION_ICONS) != 0) { - Slog.i(TAG, "DISABLE_NOTIFICATION_ICONS: yes" + (mNotificationDNDMode?" (DND)":"")); + Log.i(TAG, "DISABLE_NOTIFICATION_ICONS: yes" + (mNotificationDNDMode?" (DND)":"")); mTicker.halt(); } else { - Slog.i(TAG, "DISABLE_NOTIFICATION_ICONS: no" + (mNotificationDNDMode?" (DND)":"")); + Log.i(TAG, "DISABLE_NOTIFICATION_ICONS: no" + (mNotificationDNDMode?" (DND)":"")); } // refresh icons to show either notifications or the DND message @@ -1089,7 +1089,7 @@ public class TabletStatusBar extends BaseStatusBar implements on = true; } - Slog.v(TAG, "setLightsOn(" + on + ")"); + Log.v(TAG, "setLightsOn(" + on + ")"); if (on) { setSystemUiVisibility(0, View.SYSTEM_UI_FLAG_LOW_PROFILE); } else { @@ -1099,7 +1099,7 @@ public class TabletStatusBar extends BaseStatusBar implements public void topAppWindowChanged(boolean showMenu) { if (DEBUG) { - Slog.d(TAG, (showMenu?"showing":"hiding") + " the MENU button"); + Log.d(TAG, (showMenu?"showing":"hiding") + " the MENU button"); } mMenuButton.setVisibility(showMenu ? View.VISIBLE : View.GONE); @@ -1182,7 +1182,7 @@ public class TabletStatusBar extends BaseStatusBar implements @Override public void setHardKeyboardStatus(boolean available, boolean enabled) { if (DEBUG) { - Slog.d(TAG, "Set hard keyboard status: available=" + available + Log.d(TAG, "Set hard keyboard status: available=" + available + ", enabled=" + enabled); } mInputMethodSwitchButton.setHardKeyboardStatus(available); @@ -1201,7 +1201,7 @@ public class TabletStatusBar extends BaseStatusBar implements private boolean isImmersive() { try { return ActivityManagerNative.getDefault().isTopActivityImmersive(); - //Slog.d(TAG, "Top activity is " + (immersive?"immersive":"not immersive")); + //Log.d(TAG, "Top activity is " + (immersive?"immersive":"not immersive")); } catch (RemoteException ex) { // the end is nigh return false; @@ -1228,14 +1228,14 @@ public class TabletStatusBar extends BaseStatusBar implements }; public void onClickRecentButton() { - if (DEBUG) Slog.d(TAG, "clicked recent apps; disabled=" + mDisabled); + if (DEBUG) Log.d(TAG, "clicked recent apps; disabled=" + mDisabled); if ((mDisabled & StatusBarManager.DISABLE_EXPAND) == 0) { toggleRecentApps(); } } public void onClickInputMethodSwitchButton() { - if (DEBUG) Slog.d(TAG, "clicked input methods panel; disabled=" + mDisabled); + if (DEBUG) Log.d(TAG, "clicked input methods panel; disabled=" + mDisabled); int msg = (mInputMethodsPanel.getVisibility() == View.GONE) ? MSG_OPEN_INPUT_METHODS_PANEL : MSG_CLOSE_INPUT_METHODS_PANEL; mHandler.removeMessages(msg); @@ -1272,7 +1272,7 @@ public class TabletStatusBar extends BaseStatusBar implements } public boolean onTouch(View v, MotionEvent event) { -// Slog.d(TAG, String.format("touch: (%.1f, %.1f) initial: (%.1f, %.1f)", +// Log.d(TAG, String.format("touch: (%.1f, %.1f) initial: (%.1f, %.1f)", // event.getX(), // event.getY(), // mInitialTouchX, @@ -1333,7 +1333,7 @@ public class TabletStatusBar extends BaseStatusBar implements public void resetNotificationPeekFadeTimer() { if (DEBUG) { - Slog.d(TAG, "setting peek fade timer for " + NOTIFICATION_PEEK_FADE_DELAY + Log.d(TAG, "setting peek fade timer for " + NOTIFICATION_PEEK_FADE_DELAY + "ms from now"); } mHandler.removeMessages(MSG_CLOSE_NOTIFICATION_PEEK); @@ -1393,7 +1393,7 @@ public class TabletStatusBar extends BaseStatusBar implements int N = mNotificationData.size(); if (DEBUG) { - Slog.d(TAG, "refreshing icons: " + N + " notifications, mIconLayout=" + mIconLayout); + Log.d(TAG, "refreshing icons: " + N + " notifications, mIconLayout=" + mIconLayout); } ArrayList<View> toShow = new ArrayList<View>(); diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarView.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarView.java index 30d49ca..cd1c942 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBarView.java @@ -23,7 +23,7 @@ import com.android.systemui.statusbar.DelegateViewHelper; import android.content.Context; import android.os.Handler; import android.util.AttributeSet; -import android.util.Slog; +import android.util.Log; import android.view.View; import android.view.MotionEvent; import android.widget.FrameLayout; @@ -80,7 +80,7 @@ public class TabletStatusBarView extends FrameLayout { public boolean onInterceptTouchEvent(MotionEvent ev) { if (ev.getAction() == MotionEvent.ACTION_DOWN) { if (TabletStatusBar.DEBUG) { - Slog.d(TabletStatusBar.TAG, "TabletStatusBarView intercepting touch event: " + ev); + Log.d(TabletStatusBar.TAG, "TabletStatusBarView intercepting touch event: " + ev); } // do not close the recents panel here- the intended behavior is that recents is dismissed // on touch up when clicking on status bar buttons @@ -96,7 +96,7 @@ public class TabletStatusBarView extends FrameLayout { if (mPanels[i] != null && mPanels[i].getVisibility() == View.VISIBLE) { if (eventInside(mIgnoreChildren[i], ev)) { if (TabletStatusBar.DEBUG) { - Slog.d(TabletStatusBar.TAG, + Log.d(TabletStatusBar.TAG, "TabletStatusBarView eating event for view: " + mIgnoreChildren[i]); } @@ -106,7 +106,7 @@ public class TabletStatusBarView extends FrameLayout { } } if (TabletStatusBar.DEBUG) { - Slog.d(TabletStatusBar.TAG, "TabletStatusBarView not intercepting event"); + Log.d(TabletStatusBar.TAG, "TabletStatusBarView not intercepting event"); } if (mDelegateHelper != null && mDelegateHelper.onInterceptTouchEvent(ev)) { return true; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java index 095c441..04e0e56 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletTicker.java @@ -29,7 +29,7 @@ import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.IBinder; import android.os.Message; -import android.util.Slog; +import android.util.Log; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; @@ -89,7 +89,7 @@ public class TabletTicker public void add(IBinder key, StatusBarNotification notification) { if (false) { - Slog.d(TAG, "add 1 mCurrentNotification=" + mCurrentNotification + Log.d(TAG, "add 1 mCurrentNotification=" + mCurrentNotification + " mQueuePos=" + mQueuePos + " mQueue=" + Arrays.toString(mQueue)); } @@ -195,7 +195,7 @@ public class TabletTicker mCurrentKey = mKeys[0]; mCurrentNotification = mQueue[0]; if (false) { - Slog.d(TAG, "dequeue mQueuePos=" + mQueuePos + " mQueue=" + Arrays.toString(mQueue)); + Log.d(TAG, "dequeue mQueuePos=" + mQueuePos + " mQueue=" + Arrays.toString(mQueue)); } final int N = mQueuePos; for (int i=0; i<N; i++) { @@ -276,7 +276,7 @@ public class TabletTicker if (expanded == null) { final String ident = notification.getPackageName() + "/0x" + Integer.toHexString(notification.getId()); - Slog.e(TAG, "couldn't inflate view for notification " + ident, exception); + Log.e(TAG, "couldn't inflate view for notification " + ident, exception); return null; } FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams( diff --git a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java index 06696fe..a3eeb47 100644 --- a/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java +++ b/packages/SystemUI/src/com/android/systemui/usb/StorageNotification.java @@ -29,7 +29,7 @@ import android.os.UserHandle; import android.os.storage.StorageEventListener; import android.os.storage.StorageManager; import android.provider.Settings; -import android.util.Slog; +import android.util.Log; public class StorageNotification extends StorageEventListener { private static final String TAG = "StorageNotification"; @@ -71,7 +71,7 @@ public class StorageNotification extends StorageEventListener { mStorageManager = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE); final boolean connected = mStorageManager.isUsbMassStorageConnected(); - if (DEBUG) Slog.d(TAG, String.format( "Startup with UMS connection %s (media state %s)", + if (DEBUG) Log.d(TAG, String.format( "Startup with UMS connection %s (media state %s)", mUmsAvailable, Environment.getExternalStorageState())); HandlerThread thr = new HandlerThread("SystemUI StorageNotification"); @@ -102,7 +102,7 @@ public class StorageNotification extends StorageEventListener { */ String st = Environment.getExternalStorageState(); - if (DEBUG) Slog.i(TAG, String.format("UMS connection changed to %s (media state %s)", + if (DEBUG) Log.i(TAG, String.format("UMS connection changed to %s (media state %s)", connected, st)); if (connected && (st.equals( @@ -129,7 +129,7 @@ public class StorageNotification extends StorageEventListener { } private void onStorageStateChangedAsync(String path, String oldState, String newState) { - if (DEBUG) Slog.i(TAG, String.format( + if (DEBUG) Log.i(TAG, String.format( "Media {%s} state changed from {%s} -> {%s}", path, oldState, newState)); if (newState.equals(Environment.MEDIA_SHARED)) { /* @@ -250,7 +250,7 @@ public class StorageNotification extends StorageEventListener { true, true, null); updateUsbMassStorageNotification(false); } else { - Slog.w(TAG, String.format("Ignoring unknown state {%s}", newState)); + Log.w(TAG, String.format("Ignoring unknown state {%s}", newState)); } } |