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

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

Merge "Fix multi-touch input in auto-caps field" into jb-mr1-dev

parents fb955693 44972bcd

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

+0 −3
Original line number Diff line number Diff line
@@ -604,9 +604,6 @@ public class Keyboard { 
            }



            public float getKeyX(TypedArray keyAttr) {

                final int widthType = Builder.getEnumValue(keyAttr,

                        R.styleable.Keyboard_Key_keyWidth, KEYWIDTH_NOT_ENUM);



                final int keyboardRightEdge = mParams.mOccupiedWidth

                        - mParams.mHorizontalEdgesPadding;

                if (keyAttr.hasValue(R.styleable.Keyboard_Key_keyXPos)) {

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

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ public class PointerTracker { 
            if (mDrawingProxy != null) {

                setReleasedKeyGraphics(mCurrentKey);

            }

            mCurrentKey = newKey;

            // Keep {@link #mCurrentKey} that comes from previous keyboard.

        }

        final int keyQuarterWidth = mKeyboard.mMostCommonKeyWidth / 4;

        mKeyQuarterWidthSquared = keyQuarterWidth * keyQuarterWidth;