Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6150abd8: am f554042a: Merge "Switch DeadZone to Slog." into klp-dev

Browse Source 
* commit '6150abd8f9557a923e1e9753d5c35d241cd79411':
  Switch DeadZone to Slog.
This commit is contained in:
Daniel Sandler
2013-11-13 12:14:19 -08:00
committed by Android Git Automerger
parent c4f535bdda 6150abd8f9
commit 94913629be
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java
View File

@@ -22,7 +22,7 @@ import android.content.res.TypedArray;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.os.SystemClock; import android.os.SystemClock;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Slog;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
@@ -75,7 +75,7 @@ public class DeadZone extends View {
mVertical = (index == VERTICAL); mVertical = (index == VERTICAL);
if (DEBUG) if (DEBUG)
Log.v(TAG, this + " size=[" + mSizeMin + "-" + mSizeMax + "] hold=" + mHold Slog.v(TAG, this + " size=[" + mSizeMin + "-" + mSizeMax + "] hold=" + mHold
+ (mVertical ? " vertical" : " horizontal")); + (mVertical ? " vertical" : " horizontal"));
setFlashOnTouchCapture(context.getResources().getBoolean(R.bool.config_dead_zone_flash)); setFlashOnTouchCapture(context.getResources().getBoolean(R.bool.config_dead_zone_flash));
@@ -106,7 +106,7 @@ public class DeadZone extends View {
@Override @Override
public boolean onTouchEvent(MotionEvent event) { public boolean onTouchEvent(MotionEvent event) {
if (DEBUG) { 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(); final int action = event.getAction();
@@ -114,12 +114,12 @@ public class DeadZone extends View {
poke(event); poke(event);
} else if (action == MotionEvent.ACTION_DOWN) { } else if (action == MotionEvent.ACTION_DOWN) {
if (DEBUG) { 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()); int size = (int) getSize(event.getEventTime());
if ((mVertical && event.getX() < size) || event.getY() < size) { if ((mVertical && event.getX() < size) || event.getY() < size) {
if (CHATTY) { if (CHATTY) {
Log.v(TAG, "consuming errant click: (" + event.getX() + "," + event.getY() + ")"); Slog.v(TAG, "consuming errant click: (" + event.getX() + "," + event.getY() + ")");
} }
if (mShouldFlash) { if (mShouldFlash) {
post(mDebugFlash); post(mDebugFlash);
@@ -134,7 +134,7 @@ public class DeadZone extends View {
public void poke(MotionEvent event) { public void poke(MotionEvent event) {
mLastPokeTime = event.getEventTime(); mLastPokeTime = event.getEventTime();
if (DEBUG) if (DEBUG)
Log.v(TAG, "poked! size=" + getSize(mLastPokeTime)); Slog.v(TAG, "poked! size=" + getSize(mLastPokeTime));
if (mShouldFlash) postInvalidate(); if (mShouldFlash) postInvalidate();
} }