diff options
author | Dianne Hackborn <hackbod@google.com> | 2009-11-11 17:12:28 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2009-11-11 17:12:28 -0800 |
commit | e0751066b05eda8532b7c7d9d55003796490e334 (patch) | |
tree | 072685e3e5a460b2d83cb3f32b417724e7174097 | |
parent | 2a7b0b996fba30cb57062559773e8855c8cf1b9e (diff) | |
parent | 250aa068eae7424d454fc65ea83c8a65ca717112 (diff) | |
download | frameworks_base-e0751066b05eda8532b7c7d9d55003796490e334.zip frameworks_base-e0751066b05eda8532b7c7d9d55003796490e334.tar.gz frameworks_base-e0751066b05eda8532b7c7d9d55003796490e334.tar.bz2 |
am 250aa068: Merge change Idf7fafd3 into eclair
Merge commit '250aa068eae7424d454fc65ea83c8a65ca717112' into eclair-mr2
* commit '250aa068eae7424d454fc65ea83c8a65ca717112':
Fix issue #2248951: Need to turn off touch filtering outside of sholes
-rw-r--r-- | core/res/res/values/config.xml | 7 | ||||
-rw-r--r-- | services/java/com/android/server/KeyInputQueue.java | 5 |
2 files changed, 11 insertions, 1 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index aaa1d8b..822a59a 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -207,4 +207,11 @@ <!-- Enables swipe versus poly-finger touch disambiguation in the KeyboardView --> <bool name="config_swipeDisambiguation">true</bool> + + <!-- Enables special filtering code in the framework for raw touch events + from the touch driver. This code exists for one particular device, + and should not be enabled for any others. Hopefully in the future + it will be removed when the lower-level touch driver generates better + data. --> + <bool name="config_filterTouchEvents">false</bool> </resources> diff --git a/services/java/com/android/server/KeyInputQueue.java b/services/java/com/android/server/KeyInputQueue.java index d68ccfa..a885df8 100644 --- a/services/java/com/android/server/KeyInputQueue.java +++ b/services/java/com/android/server/KeyInputQueue.java @@ -56,7 +56,7 @@ public abstract class KeyInputQueue { * Turn on some hacks we have to improve the touch interaction with a * certain device whose screen currently is not all that good. */ - static final boolean BAD_TOUCH_HACK = true; + static boolean BAD_TOUCH_HACK = false; private static final String EXCLUDED_DEVICES_PATH = "etc/excluded-input-devices.xml"; @@ -282,6 +282,9 @@ public abstract class KeyInputQueue { lt = new LatencyTimer(100, 1000); } + BAD_TOUCH_HACK = context.getResources().getBoolean( + com.android.internal.R.bool.config_filterTouchEvents); + mHapticFeedbackCallback = hapticFeedbackCallback; readExcludedDevices(); |