aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/WordComposer.java
diff options
context:
space:
mode:
authorJean Chalard <jchalard@google.com>2012-08-21 04:39:03 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-08-21 04:39:04 -0700
commit8b6b5592cb2f3789fade5a6e04a328788e61a292 (patch)
tree1986f61652adfd57681e6f2e38a2f4093014badc /java/src/com/android/inputmethod/latin/WordComposer.java
parent324cc1dbe60a39b65989356067a03f2ff9fb1a86 (diff)
parent1eba97d92fb5caa4f23425837b6680ccc2a23ae8 (diff)
downloadlatinime-8b6b5592cb2f3789fade5a6e04a328788e61a292.tar.gz
latinime-8b6b5592cb2f3789fade5a6e04a328788e61a292.tar.xz
latinime-8b6b5592cb2f3789fade5a6e04a328788e61a292.zip
Merge "Treat all caps for gesture input." into jb-mr1-dev
Diffstat (limited to 'java/src/com/android/inputmethod/latin/WordComposer.java')
-rw-r--r--java/src/com/android/inputmethod/latin/WordComposer.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/WordComposer.java b/java/src/com/android/inputmethod/latin/WordComposer.java
index 64e833bde..ecec60f89 100644
--- a/java/src/com/android/inputmethod/latin/WordComposer.java
+++ b/java/src/com/android/inputmethod/latin/WordComposer.java
@@ -265,7 +265,14 @@ public class WordComposer {
* @return true if all user typed chars are upper case, false otherwise
*/
public boolean isAllUpperCase() {
- return (mCapsCount > 0) && (mCapsCount == size());
+ return mCapitalizedMode == CAPS_MODE_AUTO_SHIFT_LOCKED
+ || mCapitalizedMode == CAPS_MODE_MANUAL_SHIFT_LOCKED
+ || (mCapsCount > 0) && (mCapsCount == size());
+ }
+
+ public boolean wasShiftedNoLock() {
+ return mCapitalizedMode == CAPS_MODE_AUTO_SHIFTED
+ || mCapitalizedMode == CAPS_MODE_MANUAL_SHIFTED;
}
/**