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

Commit d78b9f7d authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by android code review
Browse files

Merge "Fixing unused private field error"

parents 38be4ee0 be8a4cca
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ ProximityInfo::ProximityInfo(const std::string localeStr, const int maxProximity
        const int32_t *keyYCoordinates, const int32_t *keyWidths, const int32_t *keyHeights,
        const int32_t *keyCharCodes, const float *sweetSpotCenterXs, const float *sweetSpotCenterYs,
        const float *sweetSpotRadii)
        : MAX_PROXIMITY_CHARS_SIZE(maxProximityCharsSize), KEYBOARD_WIDTH(keyboardWidth),
          KEYBOARD_HEIGHT(keyboardHeight), GRID_WIDTH(gridWidth), GRID_HEIGHT(gridHeight),
        : MAX_PROXIMITY_CHARS_SIZE(maxProximityCharsSize),
          GRID_WIDTH(gridWidth), GRID_HEIGHT(gridHeight),
          MOST_COMMON_KEY_WIDTH_SQUARE(mostCommonKeyWidth * mostCommonKeyWidth),
          CELL_WIDTH((keyboardWidth + gridWidth - 1) / gridWidth),
          CELL_HEIGHT((keyboardHeight + gridHeight - 1) / gridHeight),
+0 −4
Original line number Diff line number Diff line
@@ -98,8 +98,6 @@ class ProximityInfo {
            const int x, const int y, const int32_t primaryKey, int *inputCodes) const;

    const int MAX_PROXIMITY_CHARS_SIZE;
    const int KEYBOARD_WIDTH;
    const int KEYBOARD_HEIGHT;
    const int GRID_WIDTH;
    const int GRID_HEIGHT;
    const int MOST_COMMON_KEY_WIDTH_SQUARE;
@@ -108,8 +106,6 @@ class ProximityInfo {
    const int KEY_COUNT;
    const bool HAS_TOUCH_POSITION_CORRECTION_DATA;
    const std::string mLocaleStr;
    // TODO: remove this
    const int *mInputCodesFromJava;
    int32_t *mInputCodes;
    const int *mInputXCoordinates;
    const int *mInputYCoordinates;