commit 84b1284d01ffa1f730763471e1f2e9eddfb8ddea
author Tadashi G. Takaoka <takaoka@google.com> Tue Aug 30 18:37:19 2011 +0900
committer Tadashi G. Takaoka <takaoka@google.com> Tue Aug 30 18:40:21 2011 +0900
tree b0cfb8853642c0b85eec31eed47bb7ffd1e02ee2
parent be34d973349909196dc3427a5653f4e119092ea7

Revert "Add hintLabel to Key constructor"

This reverts commit be34d973349909196dc3427a5653f4e119092ea7.

Bug: 5023981
Change-Id: I34f75cde035f04a9a82c9259442ed0e255cb7118

java/src/com/android/inputmethod/keyboard/Key.java

diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index e64f14d..f56b523 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -195,15 +195,15 @@
     /**
      * This constructor is being used only for key in popup mini keyboard.
      */
-    public Key(Resources res, KeyboardParams params, CharSequence popupCharacter,
-           CharSequence hintLabel, int x, int y, int width, int height, int edgeFlags) {
+    public Key(Resources res, KeyboardParams params, CharSequence popupCharacter, int x, int y,
+            int width, int height, int edgeFlags) {
         mHeight = height - params.mVerticalGap;
         mHorizontalGap = params.mHorizontalGap;
         mVerticalGap = params.mVerticalGap;
         mVisualInsetsLeft = mVisualInsetsRight = 0;
         mWidth = width - mHorizontalGap;
         mEdgeFlags = edgeFlags;
-        mHintLabel = hintLabel;
+        mHintLabel = null;
         mLabelOption = 0;
         mFunctional = false;
         mSticky = false;

java/src/com/android/inputmethod/keyboard/MiniKeyboard.java

diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
index 4a7655e..f84eb19 100644
--- a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
@@ -262,7 +262,7 @@
             for (int n = 0; n < mPopupCharacters.length; n++) {
                 final CharSequence label = mPopupCharacters[n];
                 final int row = n / params.mNumColumns;
-                final Key key = new Key(mResources, params, label, null, params.getX(n, row),
+                final Key key = new Key(mResources, params, label, params.getX(n, row),
                         params.getY(row), params.mDefaultKeyWidth, params.mDefaultRowHeight,
                         params.getRowFlags(row));
                 params.onAddKey(key);