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

Commit e5276b39 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Remove top padding parameter from MiniKeyboardBuilder constructor 

To keep unit test simple, instead of specifying top padding in
the constructor, make separate setter for it.

Change-Id: I8870622cc1bd97420637b8c465bdb6c9dd366062
parent fe1556ba

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

+8 −5
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ public class MiniKeyboardBuilder { 
        public final int mNumColumns;

        public final int mNumColumns;

        public final int mLeftKeys;

        public final int mLeftKeys;

        public final int mRightKeys; // includes default key.

        public final int mRightKeys; // includes default key.

        public final int mTopPadding;

        public int mTopPadding;





        /**

        /**

         * The object holding mini keyboard layout parameters.

         * The object holding mini keyboard layout parameters.
@@ -54,17 +54,15 @@ public class MiniKeyboardBuilder { 
         * @param rowHeight mini keyboard row height in pixel, including vertical gap.

         * @param rowHeight mini keyboard row height in pixel, including vertical gap.

         * @param coordXInParent coordinate x of the popup key in parent keyboard.

         * @param coordXInParent coordinate x of the popup key in parent keyboard.

         * @param parentKeyboardWidth parent keyboard width in pixel.

         * @param parentKeyboardWidth parent keyboard width in pixel.

         * @param topPadding top padding of mini keyboard, maybe equals to vertical gap of the

         * parent keyboard.

         * parent keyboard.

         */

         */

        public MiniKeyboardLayoutParams(int numKeys, int maxColumns, int keyWidth, int rowHeight,

        public MiniKeyboardLayoutParams(int numKeys, int maxColumns, int keyWidth, int rowHeight,

                int coordXInParent, int parentKeyboardWidth, int topPadding) {

                int coordXInParent, int parentKeyboardWidth) {

            if (parentKeyboardWidth / keyWidth < maxColumns)

            if (parentKeyboardWidth / keyWidth < maxColumns)

                throw new IllegalArgumentException("Keyboard is too small to hold mini keyboard: "

                throw new IllegalArgumentException("Keyboard is too small to hold mini keyboard: "

                        + parentKeyboardWidth + " " + keyWidth + " " + maxColumns);

                        + parentKeyboardWidth + " " + keyWidth + " " + maxColumns);

            mKeyWidth = keyWidth;

            mKeyWidth = keyWidth;

            mRowHeight = rowHeight;

            mRowHeight = rowHeight;

            mTopPadding = topPadding;





            final int numRows = (numKeys + maxColumns - 1) / maxColumns;

            final int numRows = (numKeys + maxColumns - 1) / maxColumns;

            mNumRows = numRows;

            mNumRows = numRows;
@@ -188,6 +186,10 @@ public class MiniKeyboardBuilder { 
            return rowCount == mNumRows - 1;

            return rowCount == mNumRows - 1;

        }

        }





        public void setTopPadding (int topPadding) {

            mTopPadding = topPadding;

        }



        public int getKeyboardHeight() {

        public int getKeyboardHeight() {

            return mNumRows * mRowHeight + mTopPadding;

            return mNumRows * mRowHeight + mTopPadding;

        }

        }
@@ -211,7 +213,8 @@ public class MiniKeyboardBuilder { 
                mPopupCharacters.length, parentKey.mMaxPopupColumn,

                mPopupCharacters.length, parentKey.mMaxPopupColumn,

                keyWidth, parentKeyboard.getRowHeight(),

                keyWidth, parentKeyboard.getRowHeight(),

                parentKey.mX + (parentKey.mWidth + parentKey.mGap) / 2 - keyWidth / 2,

                parentKey.mX + (parentKey.mWidth + parentKey.mGap) / 2 - keyWidth / 2,

                view.getMeasuredWidth(), keyboard.getVerticalGap());

                view.getMeasuredWidth());

        params.setTopPadding(keyboard.getVerticalGap());

        mParams = params;

        mParams = params;





        keyboard.setRowHeight(params.mRowHeight);

        keyboard.setRowHeight(params.mRowHeight);