Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0751066 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am 250aa068: Merge change Idf7fafd3 into eclair 

Merge commit '250aa068' into eclair-mr2

* commit '250aa068':
  Fix issue #2248951: Need to turn off touch filtering outside of sholes
parents 2a7b0b99 250aa068

core/res/res/values/config.xml

+7 −0
Original line number Diff line number Diff line
@@ -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>

services/java/com/android/server/KeyInputQueue.java

+4 −1
Original line number Diff line number Diff line
@@ -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();