summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI
diff options
context:
space:
mode:
authorDaniel Sandler <dsandler@android.com>2013-11-13 12:07:13 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-11-13 12:07:13 -0800
commit6150abd8f9557a923e1e9753d5c35d241cd79411 (patch)
tree9e372f2f5435ec50058f9641f6bec1f4036eb692 /packages/SystemUI
parent299e011ebd7ce9593c203ecfc9f5eed45360a5ed (diff)
parentf554042a9582c5b4ad1b0d41bc08a0caad470798 (diff)
downloadframeworks_base-6150abd8f9557a923e1e9753d5c35d241cd79411.zip
frameworks_base-6150abd8f9557a923e1e9753d5c35d241cd79411.tar.gz
frameworks_base-6150abd8f9557a923e1e9753d5c35d241cd79411.tar.bz2
am f554042a: Merge "Switch DeadZone to Slog." into klp-dev
* commit 'f554042a9582c5b4ad1b0d41bc08a0caad470798': Switch DeadZone to Slog.
Diffstat (limited to 'packages/SystemUI')
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java12
1 files changed, 6 insertions, 6 deletions
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 dca5e41..6eb88be 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.Log;
+import android.util.Slog;
import android.view.MotionEvent;
import android.view.View;
@@ -75,7 +75,7 @@ public class DeadZone extends View {
mVertical = (index == VERTICAL);
if (DEBUG)
- Log.v(TAG, this + " size=[" + mSizeMin + "-" + mSizeMax + "] hold=" + mHold
+ Slog.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) {
- Log.v(TAG, this + " onTouch: " + MotionEvent.actionToString(event.getAction()));
+ Slog.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) {
- Log.v(TAG, this + " ACTION_DOWN: " + event.getX() + "," + event.getY());
+ Slog.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) {
- Log.v(TAG, "consuming errant click: (" + event.getX() + "," + event.getY() + ")");
+ Slog.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)
- Log.v(TAG, "poked! size=" + getSize(mLastPokeTime));
+ Slog.v(TAG, "poked! size=" + getSize(mLastPokeTime));
if (mShouldFlash) postInvalidate();
}