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

Revert "Add hintLabel to Key constructor"

Browse source 
This reverts commit be34d97334.

Bug: 5023981
Change-Id: I34f75cde035f04a9a82c9259442ed0e255cb7118
This commit is contained in:
Tadashi G. Takaoka 2011-08-30 18:37:19 +09:00
parent be34d97334
commit 84b1284d01
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
java/src/com/android/inputmethod/keyboard/Key.java
View file

@ -195,15 +195,15 @@ public class Key {
/** /**
* This constructor is being used only for key in popup mini keyboard. * This constructor is being used only for key in popup mini keyboard.
*/ */
public Key(Resources res, KeyboardParams params, CharSequence popupCharacter, public Key(Resources res, KeyboardParams params, CharSequence popupCharacter, int x, int y,
CharSequence hintLabel, int x, int y, int width, int height, int edgeFlags) { int width, int height, int edgeFlags) {
mHeight = height - params.mVerticalGap; mHeight = height - params.mVerticalGap;
mHorizontalGap = params.mHorizontalGap; mHorizontalGap = params.mHorizontalGap;
mVerticalGap = params.mVerticalGap; mVerticalGap = params.mVerticalGap;
mVisualInsetsLeft = mVisualInsetsRight = 0; mVisualInsetsLeft = mVisualInsetsRight = 0;
mWidth = width - mHorizontalGap; mWidth = width - mHorizontalGap;
mEdgeFlags = edgeFlags; mEdgeFlags = edgeFlags;
mHintLabel = hintLabel; mHintLabel = null;
mLabelOption = 0; mLabelOption = 0;
mFunctional = false; mFunctional = false;
mSticky = false; mSticky = false;

2
java/src/com/android/inputmethod/keyboard/MiniKeyboard.java
View file

@ -262,7 +262,7 @@ public class MiniKeyboard extends Keyboard {
for (int n = 0; n < mPopupCharacters.length; n++) { for (int n = 0; n < mPopupCharacters.length; n++) {
final CharSequence label = mPopupCharacters[n]; final CharSequence label = mPopupCharacters[n];
final int row = n / params.mNumColumns; 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.getY(row), params.mDefaultKeyWidth, params.mDefaultRowHeight,
params.getRowFlags(row)); params.getRowFlags(row));
params.onAddKey(key); params.onAddKey(key);