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

Merge "Cleanup keyboard related code a bit"

main
Tadashi G. Takaoka 2011-08-30 03:40:37 -07:00 committed by Android (Google) Code Review
parent 392276d73d c06d0ef01d
commit 39cc806605
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
View File

@ -463,7 +463,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
mPopupPanelPointerTrackerId = tracker.mPointerId;
final Keyboard keyboard = getKeyboard();
mPopupPanel.setShifted(keyboard.isShiftedOrShiftLocked());
popupPanel.setShifted(keyboard.isShiftedOrShiftLocked());
final int pointX = (mConfigShowMiniKeyboardAtTouchedPoint) ? tracker.getLastX()
: parentKey.mX + parentKey.mWidth / 2;
final int pointY = parentKey.mY - keyboard.mVerticalGap;

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

@ -197,8 +197,8 @@ public class PopupMiniKeyboardView extends KeyboardView implements PopupPanel {
@Override
public void setShifted(boolean shifted) {
final MiniKeyboard miniKeyboard = (MiniKeyboard)getKeyboard();
if (miniKeyboard.setShifted(shifted)) {
final Keyboard keyboard = getKeyboard();
if (keyboard.setShifted(shifted)) {
invalidateAllKeys();
}
}

15
java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java
View File

@ -64,6 +64,15 @@ public class KeyboardParams {
public int mMostCommonKeyWidth = 0;
protected void clearKeys() {
mKeys.clear();
mShiftKeys.clear();
mShiftLockKeys.clear();
mShiftedIcons.clear();
mUnshiftedIcons.clear();
clearHistogram();
}
public void onAddKey(Key key) {
mKeys.add(key);
updateHistogram(key);
@ -83,6 +92,12 @@ public class KeyboardParams {
private int mMaxCount = 0;
private final Map<Integer, Integer> mHistogram = new HashMap<Integer, Integer>();
private void clearHistogram() {
mMostCommonKeyWidth = 0;
mMaxCount = 0;
mHistogram.clear();
}
private void updateHistogram(Key key) {
final Integer width = key.mWidth + key.mHorizontalGap;
final int count = (mHistogram.containsKey(width) ? mHistogram.get(width) : 0) + 1;