nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 1ebedd7a: Remove LatinKeyboard.adjustLabelCase override 

* commit '1ebedd7a15a8fd94e68fb43eb089ed87c4c5a480':
  Remove LatinKeyboard.adjustLabelCase override
main
Tadashi G. Takaoka 2011-12-18 00:15:37 -08:00 committed by Android Git Automerger
parent dbd811789f 1ebedd7a15
commit cc10b1bbb6
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
java/src/com/android/inputmethod/keyboard/Keyboard.java
View File

@ -216,8 +216,8 @@ public class Keyboard {
// TODO: Remove this method. // TODO: Remove this method.
public CharSequence adjustLabelCase(CharSequence label) { public CharSequence adjustLabelCase(CharSequence label) {
if (isShiftedOrShiftLocked() && !TextUtils.isEmpty(label) && label.length() < 3 if (mId.isAlphabetKeyboard() && isShiftedOrShiftLocked() && !TextUtils.isEmpty(label)
&& Character.isLowerCase(label.charAt(0))) { && label.length() < 3 && Character.isLowerCase(label.charAt(0))) {
return label.toString().toUpperCase(mId.mLocale); return label.toString().toUpperCase(mId.mLocale);
} }
return label; return label;

10
java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
View File

@ -28,7 +28,6 @@ import android.graphics.PorterDuff;
import android.graphics.Rect; import android.graphics.Rect;
import android.graphics.drawable.BitmapDrawable; import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import com.android.inputmethod.keyboard.internal.KeyboardBuilder; import com.android.inputmethod.keyboard.internal.KeyboardBuilder;
import com.android.inputmethod.keyboard.internal.KeyboardParams; import com.android.inputmethod.keyboard.internal.KeyboardParams;
@ -138,15 +137,6 @@ public class LatinKeyboard extends Keyboard {
return mSpaceKey; 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() { private void updateSpacebarIcon() {
if (mSpaceKey == null) return; if (mSpaceKey == null) return;
if (mNeedsToDisplayLanguage) { if (mNeedsToDisplayLanguage) {