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

Commit cb3fe46f authored by Harry Cutts's avatar Harry Cutts Committed by Automerger Merge Worker
Browse files

Merge changes I37984e86,I8b04a425 into udc-dev am: 8b2591b4 am: eac7cdba 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/21609843



Change-Id: I32bc68458a42846c671ed6581fdca3a4285f37ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 81f7018a eac7cdba

services/inputflinger/reader/mapper/TouchpadInputMapper.cpp

+11 −1
Original line number Original line Diff line number Diff line
@@ -31,6 +31,15 @@ namespace android { 




namespace {

namespace {





/**

 * Log details of each gesture output by the gestures library.

 * Enable this via "adb shell setprop log.tag.TouchpadInputMapperGestures DEBUG" (requires

 * restarting the shell)

 */

const bool DEBUG_TOUCHPAD_GESTURES =

        __android_log_is_loggable(ANDROID_LOG_DEBUG, "TouchpadInputMapperGestures",

                                  ANDROID_LOG_INFO);



// Describes a segment of the acceleration curve.

// Describes a segment of the acceleration curve.

struct CurveSegment {

struct CurveSegment {

    // The maximum pointer speed which this segment should apply. The last segment in a curve should

    // The maximum pointer speed which this segment should apply. The last segment in a curve should
@@ -251,6 +260,7 @@ std::list<NotifyArgs> TouchpadInputMapper::process(const RawEvent* rawEvent) { 




std::list<NotifyArgs> TouchpadInputMapper::sendHardwareState(nsecs_t when, nsecs_t readTime,

std::list<NotifyArgs> TouchpadInputMapper::sendHardwareState(nsecs_t when, nsecs_t readTime,

                                                             SelfContainedHardwareState schs) {

                                                             SelfContainedHardwareState schs) {

    ALOGD_IF(DEBUG_TOUCHPAD_GESTURES, "New hardware state: %s", schs.state.String().c_str());

    mProcessing = true;

    mProcessing = true;

    mGestureInterpreter->PushHardwareState(&schs.state);

    mGestureInterpreter->PushHardwareState(&schs.state);

    mProcessing = false;

    mProcessing = false;
@@ -259,7 +269,7 @@ std::list<NotifyArgs> TouchpadInputMapper::sendHardwareState(nsecs_t when, nsecs 
}

}





void TouchpadInputMapper::consumeGesture(const Gesture* gesture) {

void TouchpadInputMapper::consumeGesture(const Gesture* gesture) {

    ALOGD("Gesture ready: %s", gesture->String().c_str());

    ALOGD_IF(DEBUG_TOUCHPAD_GESTURES, "Gesture ready: %s", gesture->String().c_str());

    if (!mProcessing) {

    if (!mProcessing) {

        ALOGE("Received gesture outside of the normal processing flow; ignoring it.");

        ALOGE("Received gesture outside of the normal processing flow; ignoring it.");

        return;

        return;