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

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

Fix another mismatched attribute in KeyboardView 

This is a followup of Iea7f8f34.

Bug: 5023981
Change-Id: I1135383ff0f0a2b8a5940d0d5c407fd01706a7f7
parent 3e63fbe4

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

+4 −6
Original line number Diff line number Diff line
@@ -225,19 +225,17 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { 
            mKeyBackground = a.getDrawable(R.styleable.KeyboardView_keyBackground);

            if (a.hasValue(R.styleable.KeyboardView_keyLetterSize)) {

                mKeyLetterRatio = UNDEFINED_RATIO;

                mKeyLetterSize = a.getDimensionPixelSize(

                        R.styleable.KeyboardView_keyLetterRatio, 0);

                mKeyLetterSize = a.getDimensionPixelSize(R.styleable.KeyboardView_keyLetterSize, 0);

            } else {

                mKeyLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLetterRatio);

            }

            mKeyLargeLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLargeLetterRatio);

            if (a.hasValue(R.styleable.KeyboardView_keyLabelSize)) {

                mKeyLabelRatio = UNDEFINED_RATIO;

                mKeyLabelSize = a.getDimensionPixelSize(

                        R.styleable.KeyboardView_keyLabelRatio, 0);

                mKeyLabelSize = a.getDimensionPixelSize(R.styleable.KeyboardView_keyLabelSize, 0);

            } else {

                mKeyLabelRatio = getRatio(a, R.styleable.KeyboardView_keyLabelRatio);

            }

            mKeyLargeLetterRatio = getRatio(a, R.styleable.KeyboardView_keyLargeLetterRatio);

            mKeyHintLetterRatio = getRatio(a, R.styleable.KeyboardView_keyHintLetterRatio);

            mKeyUppercaseLetterRatio = getRatio(a,

                    R.styleable.KeyboardView_keyUppercaseLetterRatio);
@@ -268,9 +266,9 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { 
        public void updateKeyHeight(int keyHeight) {

            if (mKeyLetterRatio >= 0.0f)

                mKeyLetterSize = (int)(keyHeight * mKeyLetterRatio);

            mKeyLargeLetterSize = (int)(keyHeight * mKeyLargeLetterRatio);

            if (mKeyLabelRatio >= 0.0f)

                mKeyLabelSize = (int)(keyHeight * mKeyLabelRatio);

            mKeyLargeLetterSize = (int)(keyHeight * mKeyLargeLetterRatio);

            mKeyHintLetterSize = (int)(keyHeight * mKeyHintLetterRatio);

            mKeyUppercaseLetterSize = (int)(keyHeight * mKeyUppercaseLetterRatio);

            mKeyHintLabelSize = (int)(keyHeight * mKeyHintLabelRatio);