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

Commit f961316e authored by Omar Abdelmonem's avatar Omar Abdelmonem Committed by Android (Google) Code Review
Browse files

Merge "Remove enable_gestures_library_timer_provider flag" into main

parents 4a6cff54 fd87863d

libs/input/input_flags.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -15,13 +15,6 @@ flag { 
  bug: "271455682"

}



flag {

  name: "enable_gestures_library_timer_provider"

  namespace: "input"

  description: "Set to true to enable timer support for the touchpad Gestures library"

  bug: "297192727"

 }



 flag {

  name: "enable_input_event_tracing"

  namespace: "input"

services/inputflinger/reader/mapper/TouchpadInputMapper.cpp

+5 −14
Original line number Diff line number Diff line
@@ -258,11 +258,9 @@ TouchpadInputMapper::TouchpadInputMapper(InputDeviceContext& deviceContext, 
    // 2) TouchpadInputMapper is stored as a unique_ptr and not moved.

    mGestureInterpreter->SetPropProvider(const_cast<GesturesPropProvider*>(&gesturePropProvider),

                                         &mPropertyProvider);

    if (input_flags::enable_gestures_library_timer_provider()) {

    mGestureInterpreter->SetTimerProvider(const_cast<GesturesTimerProvider*>(

                                                  &kGestureTimerProvider),

                                          &mTimerProvider);

    }

    mGestureInterpreter->SetCallback(gestureInterpreterCallback, this);

}
@@ -300,12 +298,8 @@ void TouchpadInputMapper::dump(std::string& dump) { 
    dump += addLinePrefix(mGestureConverter.dump(), INDENT4);

    dump += INDENT3 "Gesture properties:\n";

    dump += addLinePrefix(mPropertyProvider.dump(), INDENT4);

    if (input_flags::enable_gestures_library_timer_provider()) {

    dump += INDENT3 "Timer provider:\n";

    dump += addLinePrefix(mTimerProvider.dump(), INDENT4);

    } else {

        dump += INDENT3 "Timer provider: disabled by flag\n";

    }

    dump += INDENT3 "Captured event converter:\n";

    dump += addLinePrefix(mCapturedEventConverter.dump(), INDENT4);

    dump += StringPrintf(INDENT3 "DisplayId: %s\n",
@@ -468,9 +462,6 @@ std::list<NotifyArgs> TouchpadInputMapper::sendHardwareState(nsecs_t when, nsecs 
}



std::list<NotifyArgs> TouchpadInputMapper::timeoutExpired(nsecs_t when) {

    if (!input_flags::enable_gestures_library_timer_provider()) {

        return {};

    }

    mTimerProvider.triggerCallbacks(when);

    return processGestures(when, when);

}