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

am 0dd248ea: Merge "Turn off deadzone flash, replacing it with logcat." into jb-mr1-dev

Browse Source 
* commit '0dd248ea61e1b8d56b342266cc9ef045f5742048':
  Turn off deadzone flash, replacing it with logcat.
This commit is contained in:
Daniel Sandler
2012-08-30 14:15:47 -07:00
committed by Android Git Automerger
parent 6cd3c3e6a7 0dd248ea61
commit 7c1aa7f99d
2 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/values/config.xml
View File

@@ -76,5 +76,7 @@
<!-- decay duration (from size_max -> size), in ms -->
<integer name="navigation_bar_deadzone_hold">333</integer>
<integer name="navigation_bar_deadzone_decay">333</integer>
<bool name="config_dead_zone_flash">false</bool>
</resources>

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

@@ -35,6 +35,8 @@ public class DeadZone extends View {
public static final int HORIZONTAL = 0;
public static final int VERTICAL = 1;
private static final boolean CHATTY = true; // print to logcat when we eat a click
private boolean mShouldFlash;
private float mFlashFrac = 0f;
@@ -76,7 +78,7 @@ public class DeadZone extends View {
Slog.v(TAG, this + " size=[" + mSizeMin + "-" + mSizeMax + "] hold=" + mHold
+ (mVertical ? " vertical" : " horizontal"));
setFlashOnTouchCapture(true);
setFlashOnTouchCapture(context.getResources().getBoolean(R.bool.config_dead_zone_flash));
}
static float lerp(float a, float b, float f) {
@@ -100,27 +102,30 @@ public class DeadZone extends View {
postInvalidate();
}
// I made you a touch event
// I made you a touch event...
@Override
public boolean onTouchEvent(MotionEvent event) {
if (DEBUG)
if (DEBUG) {
Slog.v(TAG, this + " onTouch: " + MotionEvent.actionToString(event.getAction()));
}
final int action = event.getAction();
if (action == MotionEvent.ACTION_OUTSIDE) {
poke(event);
} else if (action == MotionEvent.ACTION_DOWN) {
if (DEBUG)
if (DEBUG) {
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 (DEBUG)
Slog.v(TAG, "eating click!");
if (CHATTY) {
Slog.v(TAG, "consuming errant click: (" + event.getX() + "," + event.getY() + ")");
}
if (mShouldFlash) {
post(mDebugFlash);
postInvalidate();
}
return true; // but I eated it
return true; // ...but I eated it
}
}
return false;