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

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

Don't use KeyDrawParams as argument of Key#selectTextSize 

This is a follow up of Ide48c361.

Bug: 6509415
Change-Id: I59f6e47d06ebfbac6d354d36fca6788f092ed41d
parent aee147e2

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

+9 −9
Original line number Diff line number Diff line
@@ -493,21 +493,21 @@ public class Key { 
        }

    }



    public int selectTextSize(KeyboardView.KeyDrawParams params) {

    public int selectTextSize(int letterSize, int largeLetterSize, int labelSize,

            int largeLabelSize, int hintLabelSize) {

        switch (mLabelFlags & LABEL_FLAGS_FOLLOW_KEY_TEXT_RATIO_MASK) {

        case LABEL_FLAGS_FOLLOW_KEY_LARGE_LETTER_RATIO:

            return params.mKeyLargeLetterSize;

        case LABEL_FLAGS_FOLLOW_KEY_LETTER_RATIO:

            return params.mKeyLetterSize;

            return letterSize;

        case LABEL_FLAGS_FOLLOW_KEY_LARGE_LETTER_RATIO:

            return largeLetterSize;

        case LABEL_FLAGS_FOLLOW_KEY_LABEL_RATIO:

            return params.mKeyLabelSize;

            return labelSize;

        case LABEL_FLAGS_FOLLOW_KEY_LARGE_LABEL_RATIO:

            return params.mKeyLargeLabelSize;

            return largeLabelSize;

        case LABEL_FLAGS_FOLLOW_KEY_HINT_LABEL_RATIO:

            return params.mKeyHintLabelSize;

            return hintLabelSize;

        default: // No follow key ratio flag specified.

            return StringUtils.codePointCount(mLabel) == 1

                    ? params.mKeyLetterSize : params.mKeyLabelSize;

            return StringUtils.codePointCount(mLabel) == 1 ? letterSize : labelSize;

        }

    }

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

+3 −1
Original line number Diff line number Diff line
@@ -573,7 +573,9 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { 
            final String label = key.mLabel;

            // For characters, use large font. For labels like "Done", use smaller font.

            paint.setTypeface(key.selectTypeface(params.mKeyTextStyle));

            final int labelSize = key.selectTextSize(params);

            final int labelSize = key.selectTextSize(params.mKeyLetterSize,

                    params.mKeyLargeLetterSize, params.mKeyLabelSize, params.mKeyLargeLabelSize,

                    params.mKeyHintLabelSize);

            paint.setTextSize(labelSize);

            final float labelCharHeight = getCharHeight(KEY_LABEL_REFERENCE_CHAR, paint);

            final float labelCharWidth = getCharWidth(KEY_LABEL_REFERENCE_CHAR, paint);