From 1ebedd7a15a8fd94e68fb43eb089ed87c4c5a480 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Sun, 18 Dec 2011 03:51:08 +0900
Subject: [PATCH] Remove LatinKeyboard.adjustLabelCase override

Change-Id: If032605c1cd6bb8e913d465e20dec70798c4b8fb
---
 .../src/com/android/inputmethod/keyboard/Keyboard.java |  4 ++--
 .../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) {