aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2010-11-13 00:16:34 -0800
committerTadashi G. Takaoka <takaoka@google.com>2010-11-18 19:32:59 -0800
commitf27364600c742509b48857e6b8f17312033e0dc7 (patch)
treea07e3d98753fac073d34a643957204beaadcd4c4 /java/src/com/android/inputmethod/latin/LatinKeyboardView.java
parent1d2d3228a393b3c562226936e3523eed4894def4 (diff)
downloadlatinime-f27364600c742509b48857e6b8f17312033e0dc7.tar.gz
latinime-f27364600c742509b48857e6b8f17312033e0dc7.tar.xz
latinime-f27364600c742509b48857e6b8f17312033e0dc7.zip
Implement both automatic and manual temporary upper cases
With this change, - Shift and Shift lock state of keyboard is maintained by LatinKeyboard.ShiftState. - Shift key state is maintained by ShiftKeyState object in KeyboardSwitcher. - LatinIME informs KeyboardSwitcher that shift key press, release and long press and KeyboardSwitcher determines which state LatinKeyboard and ShiftLeyState should be. Bug: 3193390 Change-Id: I948ef26fda512eb1cb0ebddc89d322c4f4f4d670
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinKeyboardView.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinKeyboardView.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
index 3bcac4ec1..a215621d1 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardView.java
@@ -119,7 +119,7 @@ public class LatinKeyboardView extends BaseKeyboardView {
protected CharSequence adjustCase(CharSequence label) {
LatinKeyboard keyboard = getLatinKeyboard();
if (keyboard.isAlphaKeyboard()
- && keyboard.isShifted()
+ && keyboard.isShiftedOrShiftLocked()
&& !TextUtils.isEmpty(label) && label.length() < 3
&& Character.isLowerCase(label.charAt(0))) {
label = label.toString().toUpperCase();