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

Commit 040f1c50 authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android (Google) Code Review
Browse files

Merge "Debug flag" into jb-mr1-dev

parents 41c2765b 952ec497

native/jni/src/defines.h

+4 −0
Original line number Diff line number Diff line
@@ -220,7 +220,11 @@ static inline void prof_out(void) { 
#define DEBUG_CORRECTION_FREQ false

#define DEBUG_WORDS_PRIORITY_QUEUE false



#ifdef FLAG_FULL_DBG

#define DEBUG_GEO_FULL true

#else

#define DEBUG_GEO_FULL false

#endif



#else // FLAG_DBG

native/jni/src/proximity_info_state.cpp

+10 −2
Original line number Diff line number Diff line
@@ -124,8 +124,8 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi 
                const int x = proximityOnly ? NOT_A_COORDINATE : xCoordinates[i];

                const int y = proximityOnly ? NOT_A_COORDINATE : yCoordinates[i];

                const int time = times ? times[i] : -1;

                if (pushTouchPoint(i, c, x, y, time, isGeometric, i == lastInputIndex,

                        currentNearKeysDistances, prevNearKeysDistances,

                if (pushTouchPoint(i, c, x, y, time, isGeometric /* do sampling */,

                        i == lastInputIndex, currentNearKeysDistances, prevNearKeysDistances,

                        prevPrevNearKeysDistances)) {

                    // Previous point information was popped.

                    NearKeysDistanceMap *tmp = prevNearKeysDistances;
@@ -218,6 +218,10 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxPoi 
            }

        }

    }



    if (DEBUG_GEO_FULL) {

        AKLOGI("ProximityState init finished: %d points out of %d", mInputSize, inputSize);

    }

}



bool ProximityInfoState::checkAndReturnIsContinuationPossible(const int inputSize,
@@ -402,6 +406,10 @@ bool ProximityInfoState::pushTouchPoint(const int inputIndex, const int nodeChar 
    mInputYs.push_back(y);

    mTimes.push_back(time);

    mInputIndice.push_back(inputIndex);

    if (DEBUG_GEO_FULL) {

        AKLOGI("pushTouchPoint: x = %03d, y = %03d, time = %d, index = %d, popped ? %01d",

                x, y, time, inputIndex, popped);

    }

    return popped;

}