Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39cc8066 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Cleanup keyboard related code a bit"

parents 392276d7 c06d0ef0

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

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

+2 −2
Original line number Diff line number Diff line
@@ -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();

        }

    }

java/src/com/android/inputmethod/keyboard/internal/KeyboardParams.java

+15 −0
Original line number Diff line number Diff line
@@ -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;