From 25bb8eec2d63add7d43d357c26f9792ae6156a92 Mon Sep 17 00:00:00 2001
From: Daniel Sandler <dsandler@android.com>
Date: Thu, 30 Aug 2012 17:10:50 -0400
Subject: [PATCH] Turn off deadzone flash, replacing it with logcat.

Change-Id: I30db97e5c3a6ef3a06e6065ccf087a7f6d1f9286
---
 packages/SystemUI/res/values/config.xml       |  2 ++
 .../systemui/statusbar/policy/DeadZone.java   | 19 ++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 333757333d9af..13622e6145fd0 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -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>
 
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 6ffca2a9f0ad3..e5ef5fe83f8ee 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/DeadZone.java
@@ -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;