From 84b1284d01ffa1f730763471e1f2e9eddfb8ddea Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Tue, 30 Aug 2011 18:37:19 +0900
Subject: [PATCH] Revert "Add hintLabel to Key constructor"
This reverts commit be34d973349909196dc3427a5653f4e119092ea7.
Bug: 5023981
Change-Id: I34f75cde035f04a9a82c9259442ed0e255cb7118
---
java/src/com/android/inputmethod/keyboard/Key.java | 6 +++---
java/src/com/android/inputmethod/keyboard/MiniKeyboard.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/src/com/android/inputmethod/keyboard/Key.java b/java/src/com/android/inputmethod/keyboard/Key.java
index e64f14d9b5..f56b523889 100644
--- a/java/src/com/android/inputmethod/keyboard/Key.java
+++ b/java/src/com/android/inputmethod/keyboard/Key.java
@@ -195,15 +195,15 @@ public class Key {
/**
* 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;
diff --git a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
index 4a7655e34d..f84eb19cd3 100644
--- a/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
+++ b/java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
@@ -262,7 +262,7 @@ public class MiniKeyboard extends Keyboard {
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);
--
GitLab