diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2011-12-18 00:15:37 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2011-12-18 00:15:37 -0800 |
| commit | cc10b1bbb6025875c8f8daac53b8288e57bccf46 (patch) | |
| tree | 78e7588be1fc06f33812d0bb04aae9eb79cb13d1 /java/src/com | |
| parent | dbd811789fd82d6ffb496fbc81c3ce2ee8c69c87 (diff) | |
| parent | 1ebedd7a15a8fd94e68fb43eb089ed87c4c5a480 (diff) | |
| download | latinime-cc10b1bbb6025875c8f8daac53b8288e57bccf46.tar.gz latinime-cc10b1bbb6025875c8f8daac53b8288e57bccf46.tar.xz latinime-cc10b1bbb6025875c8f8daac53b8288e57bccf46.zip | |
am 1ebedd7a: Remove LatinKeyboard.adjustLabelCase override
* commit '1ebedd7a15a8fd94e68fb43eb089ed87c4c5a480':
Remove LatinKeyboard.adjustLabelCase override
Diffstat (limited to 'java/src/com')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/Keyboard.java | 4 | ||||
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/LatinKeyboard.java | 10 |
2 files changed, 2 insertions, 12 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/Keyboard.java b/java/src/com/android/inputmethod/keyboard/Keyboard.java index f21d4545e..b7dd302b7 100644 --- a/java/src/com/android/inputmethod/keyboard/Keyboard.java +++ b/java/src/com/android/inputmethod/keyboard/Keyboard.java @@ -216,8 +216,8 @@ public class Keyboard { // TODO: Remove this method. public CharSequence adjustLabelCase(CharSequence label) { - if (isShiftedOrShiftLocked() && !TextUtils.isEmpty(label) && label.length() < 3 - && Character.isLowerCase(label.charAt(0))) { + if (mId.isAlphabetKeyboard() && isShiftedOrShiftLocked() && !TextUtils.isEmpty(label) + && label.length() < 3 && Character.isLowerCase(label.charAt(0))) { return label.toString().toUpperCase(mId.mLocale); } return label; diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java index 50a8d64ce..30c07bed9 100644 --- a/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java +++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboard.java @@ -28,7 +28,6 @@ import android.graphics.PorterDuff; import android.graphics.Rect; import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.Drawable; -import android.text.TextUtils; import com.android.inputmethod.keyboard.internal.KeyboardBuilder; import com.android.inputmethod.keyboard.internal.KeyboardParams; @@ -138,15 +137,6 @@ public class LatinKeyboard extends Keyboard { return mSpaceKey; } - @Override - public CharSequence adjustLabelCase(CharSequence label) { - if (mId.isAlphabetKeyboard() && isShiftedOrShiftLocked() && !TextUtils.isEmpty(label) - && label.length() < 3 && Character.isLowerCase(label.charAt(0))) { - return label.toString().toUpperCase(mId.mLocale); - } - return label; - } - private void updateSpacebarIcon() { if (mSpaceKey == null) return; if (mNeedsToDisplayLanguage) { |