aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2011-06-21 18:03:18 +0900
committerandroid-merger <android-build@android.com>2011-06-21 10:42:53 -0700
commitec622ced359cfe646efc14b68e25539fa7a438d9 (patch)
tree6d582ddc027c722ba7dc6276b33bcab94e057c77 /java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
parente5e9bc0e4f43195ef03268565cbd68cdd18e5e2d (diff)
downloadlatinime-ec622ced359cfe646efc14b68e25539fa7a438d9.tar.gz
latinime-ec622ced359cfe646efc14b68e25539fa7a438d9.tar.xz
latinime-ec622ced359cfe646efc14b68e25539fa7a438d9.zip
Support Turkish keyboard (DO NOT MERGE)
Basically this change is back port from Master I1ae2c4ff. Bug: 4435347 Change-Id: Ide1a46bbf5584d8783bb93bbe64328f514c6ab79
Diffstat (limited to 'java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java')
-rw-r--r--java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java11
1 files changed, 10 insertions, 1 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
index 008d37202..fece78689 100644
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
+++ b/java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
@@ -50,6 +50,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import java.util.Locale;
import java.util.WeakHashMap;
/**
@@ -705,10 +706,18 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx
return mKeyDetector.isProximityCorrectionEnabled();
}
+ protected Locale getKeyboardLocale() {
+ if (mKeyboard instanceof LatinKeyboard) {
+ return ((LatinKeyboard)mKeyboard).getInputLocale();
+ } else {
+ return getContext().getResources().getConfiguration().locale;
+ }
+ }
+
protected CharSequence adjustCase(CharSequence label) {
if (mKeyboard.isShifted() && label != null && label.length() < 3
&& Character.isLowerCase(label.charAt(0))) {
- label = label.toString().toUpperCase();
+ return label.toString().toUpperCase(getKeyboardLocale());
}
return label;
}