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

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

Merge "Revert keyHintLetterPadding only to apply horizontally"

parents 805fed49 ab771b01

java/res/values/attrs.xml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
        <attr name="keyShiftedLetterHintRatio" format="float" />

        <!-- Horizontal padding of left/right aligned key label to the edge of the key. -->

        <attr name="keyLabelHorizontalPadding" format="dimension" />

        <!-- Top and right padding of hint letter to the edge of the key.-->

        <!-- Right padding of hint letter to the edge of the key.-->

        <attr name="keyHintLetterPadding" format="dimension" />

        <!-- Bottom padding of popup hint letter "..." to the edge of the key.-->

        <attr name="keyPopupHintLetterPadding" format="dimension" />

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

+2 −2
Original line number Diff line number Diff line
@@ -662,10 +662,10 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { 
                hintY = -mFontMetrics.top + params.mKeyShiftedLetterHintPadding;

                paint.setTextAlign(Align.CENTER);

            } else { // key.hasHintLetter()

                // The hint label is placed at top-right corner of the key. Used mainly on phone.

                // The hint letter is placed at top-right corner of the key. Used mainly on phone.

                hintX = keyWidth - params.mKeyHintLetterPadding

                        - getCharWidth(KEY_NUMERIC_HINT_LABEL_REFERENCE_CHAR, paint) / 2;

                hintY = -paint.ascent() + params.mKeyHintLetterPadding;

                hintY = -paint.ascent();

                paint.setTextAlign(Align.CENTER);

            }

            canvas.drawText(hint, 0, hint.length(), hintX, hintY, paint);