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

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

Revert "Add hintLabel to Key constructor" 

This reverts commit be34d973.

Bug: 5023981
Change-Id: I34f75cde035f04a9a82c9259442ed0e255cb7118
parent be34d973

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

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

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

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