nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am 76c242a1: Merge "Fix multi-touch input in auto-caps field" into jb-mr1-dev 

* commit '76c242a1f6ac2f4d50f23214dd8652e398194da9':
  Fix multi-touch input in auto-caps field
main
Tadashi G. Takaoka 2012-08-01 23:53:03 -07:00 committed by Android Git Automerger
parent 9081700172 76c242a1f6
commit ab4d177a0e
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/keyboard/Keyboard.java
View File

@ -604,9 +604,6 @@ public class Keyboard {
} }
public float getKeyX(TypedArray keyAttr) { public float getKeyX(TypedArray keyAttr) {
final int widthType = Builder.getEnumValue(keyAttr,
R.styleable.Keyboard_Key_keyWidth, KEYWIDTH_NOT_ENUM);
final int keyboardRightEdge = mParams.mOccupiedWidth final int keyboardRightEdge = mParams.mOccupiedWidth
- mParams.mHorizontalEdgesPadding; - mParams.mHorizontalEdgesPadding;
if (keyAttr.hasValue(R.styleable.Keyboard_Key_keyXPos)) { if (keyAttr.hasValue(R.styleable.Keyboard_Key_keyXPos)) {

2
java/src/com/android/inputmethod/keyboard/PointerTracker.java
View File

@ -408,7 +408,7 @@ public class PointerTracker {
if (mDrawingProxy != null) { if (mDrawingProxy != null) {
setReleasedKeyGraphics(mCurrentKey); setReleasedKeyGraphics(mCurrentKey);
} }
mCurrentKey = newKey; // Keep {@link #mCurrentKey} that comes from previous keyboard.
} }
final int keyQuarterWidth = mKeyboard.mMostCommonKeyWidth / 4; final int keyQuarterWidth = mKeyboard.mMostCommonKeyWidth / 4;
mKeyQuarterWidthSquared = keyQuarterWidth * keyQuarterWidth; mKeyQuarterWidthSquared = keyQuarterWidth * keyQuarterWidth;