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

Commit 5d99f17e authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug:... 

am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2

* commit '61220e880ac4d9d76b7fd50744439e68e929c697':
  Revert velocity damping. Bug: 4364920
parents 76ad002c b7edd04f

include/ui/Input.h

+0 −5
Original line number Original line Diff line number Diff line
@@ -655,11 +655,6 @@ private: 
    // Oldest sample to consider when calculating the velocity.

    // Oldest sample to consider when calculating the velocity.

    static const nsecs_t MAX_AGE = 200 * 1000000; // 200 ms

    static const nsecs_t MAX_AGE = 200 * 1000000; // 200 ms





    // When the total duration of the window of samples being averaged is less

    // than the window size, the resulting velocity is scaled to reduce the impact

    // of overestimation in short traces.

    static const nsecs_t MIN_WINDOW = 100 * 1000000; // 100 ms



    // The minimum duration between samples when estimating velocity.

    // The minimum duration between samples when estimating velocity.

    static const nsecs_t MIN_DURATION = 10 * 1000000; // 10 ms

    static const nsecs_t MIN_DURATION = 10 * 1000000; // 10 ms

libs/ui/Input.cpp

+0 −9
Original line number Original line Diff line number Diff line
@@ -700,7 +700,6 @@ bool MotionEvent::isTouchEvent(int32_t source, int32_t action) { 




const uint32_t VelocityTracker::HISTORY_SIZE;

const uint32_t VelocityTracker::HISTORY_SIZE;

const nsecs_t VelocityTracker::MAX_AGE;

const nsecs_t VelocityTracker::MAX_AGE;

const nsecs_t VelocityTracker::MIN_WINDOW;

const nsecs_t VelocityTracker::MIN_DURATION;

const nsecs_t VelocityTracker::MIN_DURATION;





VelocityTracker::VelocityTracker() {

VelocityTracker::VelocityTracker() {
@@ -891,14 +890,6 @@ bool VelocityTracker::getVelocity(uint32_t id, float* outVx, float* outVy) const 




        // Make sure we used at least one sample.

        // Make sure we used at least one sample.

        if (samplesUsed != 0) {

        if (samplesUsed != 0) {

            // Scale the velocity linearly if the window of samples is small.

            nsecs_t totalDuration = newestMovement.eventTime - oldestMovement.eventTime;

            if (totalDuration < MIN_WINDOW) {

                float scale = float(totalDuration) / float(MIN_WINDOW);

                accumVx *= scale;

                accumVy *= scale;

            }



            *outVx = accumVx;

            *outVx = accumVx;

            *outVy = accumVy;

            *outVy = accumVy;

            return true;

            return true;