aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-03-01 02:40:08 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-01 02:40:08 -0800
commitc2acf42ed2b25281b31b18f987080355320de60d (patch)
tree1e58149dd17ba94693339dd652d6de0962f4d28f
parent2768f38ea1fb7dd4e9da739d67c3a1c990bde2d4 (diff)
parent61d2e10bd30050a9e851e5625857c7f17e34e544 (diff)
downloadlatinime-c2acf42ed2b25281b31b18f987080355320de60d.tar.gz
latinime-c2acf42ed2b25281b31b18f987080355320de60d.tar.xz
latinime-c2acf42ed2b25281b31b18f987080355320de60d.zip
am 61d2e10b: am f06ab499: Merge "rename define" into jb-mr2-dev
* commit '61d2e10bd30050a9e851e5625857c7f17e34e544': rename define
-rw-r--r--native/jni/src/defines.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/native/jni/src/defines.h b/native/jni/src/defines.h
index 379fb9dfd..a84dfddec 100644
--- a/native/jni/src/defines.h
+++ b/native/jni/src/defines.h
@@ -398,10 +398,10 @@ typedef enum {
EQUIVALENT_CHAR,
// It is a char located nearby on the keyboard
NEAR_PROXIMITY_CHAR,
- // It is an unrelated char
+ // It is an unrelated char and could be a substitution char
UNRELATED_CHAR,
- // It is an unrelated char and not a substitution
- UNRELATED_AND_NOT_SUBSTITUTION_CHAR,
+ // It is an unrelated char nor a substitution char
+ UNRELATED_NOR_SUBSTITUTION_CHAR,
// Additional proximity char which can differ by language.
ADDITIONAL_PROXIMITY_CHAR
} ProximityType;