Just cosmetic fixes (a47c699f) · Commits · e / os / android_packages_inputmethods_LatinIME

native/jni/src/dic_traverse_wrapper.h

+4 −4

Original line number	Diff line number	Diff line
		@@ -31,8 +31,8 @@ class DicTraverseWrapper {
		}
		return 0;
		}
		static void initDicTraverseSession(void *traverseSession,
		const Dictionary const dictionary, const int prevWord, const int prevWordLength) {
		static void initDicTraverseSession(void traverseSession, const Dictionary const dictionary,
		const int *prevWord, const int prevWordLength) {
		if (sDicTraverseSessionInitMethod) {
		sDicTraverseSessionInitMethod(traverseSession, dictionary, prevWord, prevWordLength);
		}
		@@ -42,8 +42,7 @@ class DicTraverseWrapper {
		sDicTraverseSessionReleaseMethod(traverseSession);
		}
		}
		static void setTraverseSessionFactoryMethod(
		void (factoryMethod)(JNIEnv *, jstring)) {
		static void setTraverseSessionFactoryMethod(void (factoryMethod)(JNIEnv *, jstring)) {
		sDicTraverseSessionFactoryMethod = factoryMethod;
		}
		static void setTraverseSessionInitMethod(
		@@ -53,6 +52,7 @@ class DicTraverseWrapper {
		static void setTraverseSessionReleaseMethod(void (releaseMethod)(void )) {
		sDicTraverseSessionReleaseMethod = releaseMethod;
		}

		private:
		DISALLOW_IMPLICIT_CONSTRUCTORS(DicTraverseWrapper);
		static void (sDicTraverseSessionFactoryMethod)(JNIEnv *, jstring);

native/jni/src/proximity_info.h

+13 −49

Original line number	Diff line number	Diff line
		@@ -47,57 +47,21 @@ class ProximityInfo {
		// the radius of the key is assigned to zero.
		return mSweetSpotRadii[keyIndex] > 0.0f;
		}
		float getSweetSpotRadiiAt(int keyIndex) const {
		return mSweetSpotRadii[keyIndex];
		}
		float getSweetSpotCenterXAt(int keyIndex) const {
		return mSweetSpotCenterXs[keyIndex];
		}
		float getSweetSpotCenterYAt(int keyIndex) const {
		return mSweetSpotCenterYs[keyIndex];
		}
		float getSweetSpotRadiiAt(int keyIndex) const { return mSweetSpotRadii[keyIndex]; }
		float getSweetSpotCenterXAt(int keyIndex) const { return mSweetSpotCenterXs[keyIndex]; }
		float getSweetSpotCenterYAt(int keyIndex) const { return mSweetSpotCenterYs[keyIndex]; }
		void calculateNearbyKeyCodes(
		const int x, const int y, const int primaryKey, int *inputCodes) const;

		bool hasTouchPositionCorrectionData() const {
		return HAS_TOUCH_POSITION_CORRECTION_DATA;
		}

		int getMostCommonKeyWidth() const {
		return MOST_COMMON_KEY_WIDTH;
		}

		int getMostCommonKeyWidthSquare() const {
		return MOST_COMMON_KEY_WIDTH_SQUARE;
		}

		int getKeyCount() const {
		return KEY_COUNT;
		}

		int getCellHeight() const {
		return CELL_HEIGHT;
		}

		int getCellWidth() const {
		return CELL_WIDTH;
		}

		int getGridWidth() const {
		return GRID_WIDTH;
		}

		int getGridHeight() const {
		return GRID_HEIGHT;
		}

		int getKeyboardWidth() const {
		return KEYBOARD_WIDTH;
		}

		int getKeyboardHeight() const {
		return KEYBOARD_HEIGHT;
		}
		bool hasTouchPositionCorrectionData() const { return HAS_TOUCH_POSITION_CORRECTION_DATA; }
		int getMostCommonKeyWidth() const { return MOST_COMMON_KEY_WIDTH; }
		int getMostCommonKeyWidthSquare() const { return MOST_COMMON_KEY_WIDTH_SQUARE; }
		int getKeyCount() const { return KEY_COUNT; }
		int getCellHeight() const { return CELL_HEIGHT; }
		int getCellWidth() const { return CELL_WIDTH; }
		int getGridWidth() const { return GRID_WIDTH; }
		int getGridHeight() const { return GRID_HEIGHT; }
		int getKeyboardWidth() const { return KEYBOARD_WIDTH; }
		int getKeyboardHeight() const { return KEYBOARD_HEIGHT; }

		int getKeyCenterXOfCodePointG(int charCode) const;
		int getKeyCenterYOfCodePointG(int charCode) const;