am 3f46e8a8: am a38e14fd: Merge "Refactor skippable code point" into jb-mr2-dev

* commit '3f46e8a887a0ff6c59642d3ff68791a07574ea5c':
  Refactor skippable code point
main
Satoshi Kataoka 2013-03-13 19:38:49 -07:00 committed by Android Git Automerger
commit 5a84bd1b22
2 changed files with 2 additions and 2 deletions

View File

@ -68,7 +68,7 @@ AK_FORCE_INLINE static int toBaseLowerCase(const int c) {
return toLowerCase(toBaseCodePoint(c)); return toLowerCase(toBaseCodePoint(c));
} }
inline static bool isSkippableCodePoint(const int codePoint) { inline static bool isIntentionalOmissionCodePoint(const int codePoint) {
// TODO: Do not hardcode here // TODO: Do not hardcode here
return codePoint == KEYCODE_SINGLE_QUOTE || codePoint == KEYCODE_HYPHEN_MINUS; return codePoint == KEYCODE_SINGLE_QUOTE || codePoint == KEYCODE_HYPHEN_MINUS;
} }

View File

@ -165,7 +165,7 @@ float ProximityInfoState::getPointToKeyLength(
const int index = inputIndex * mProximityInfo->getKeyCount() + keyId; const int index = inputIndex * mProximityInfo->getKeyCount() + keyId;
return min(mSampledDistanceCache_G[index], mMaxPointToKeyLength); return min(mSampledDistanceCache_G[index], mMaxPointToKeyLength);
} }
if (isSkippableCodePoint(codePoint)) { if (isIntentionalOmissionCodePoint(codePoint)) {
return 0.0f; return 0.0f;
} }
// If the char is not a key on the keyboard then return the max length. // If the char is not a key on the keyboard then return the max length.