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

am 232b0394: am e8f45ab5: One alternate is treated as key action, not open mini keyboard 

Merge commit '232b039496ef95c543bac5128e6378b38760de21'

* commit '232b039496ef95c543bac5128e6378b38760de21':
  One alternate is treated as key action, not open mini keyboard
main
Tadashi G. Takaoka 2010-09-03 04:13:20 -07:00 committed by Android Git Automerger
parent bf669e4379 232b039496
commit ab5653dce0
3 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/com/android/inputmethod/latin/LatinKeyboardBaseView.java
View File

@ -965,8 +965,8 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx
return false; return false;
boolean result = onLongPress(popupKey); boolean result = onLongPress(popupKey);
if (result) { if (result) {
tracker.setAlreadyProcessed();
dismissKeyPreview(); dismissKeyPreview();
tracker.setAlreadyProcessed();
} }
return result; return result;
} }

55
java/src/com/android/inputmethod/latin/LatinKeyboardView.java
View File

@ -42,7 +42,7 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
/** Whether we've started dropping move events because we found a big jump */ /** Whether we've started dropping move events because we found a big jump */
private boolean mDroppingEvents; private boolean mDroppingEvents;
/** /**
* Whether multi-touch disambiguation needs to be disabled if a real multi-touch event has * Whether multi-touch disambiguation needs to be disabled if a real multi-touch event has
* occured * occured
*/ */
@ -52,6 +52,9 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
/** The y coordinate of the last row */ /** The y coordinate of the last row */
private int mLastRowY; private int mLastRowY;
// This is local working variable for onLongPress().
private int[] mKeyCodes = new int[1];
public LatinKeyboardView(Context context, AttributeSet attrs) { public LatinKeyboardView(Context context, AttributeSet attrs) {
super(context, attrs); super(context, attrs);
} }
@ -75,17 +78,37 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
setKeyboardLocal(k); setKeyboardLocal(k);
} }
private static boolean hasOneDigitAlternate(Key key) {
final CharSequence alternates = key.popupCharacters;
if (alternates == null)
return false;
final String altChars = alternates.toString();
if (altChars.codePointCount(0, altChars.length()) != 1)
return false;
final int altCode = altChars.codePointAt(0);
return altCode >= '0' && altCode <= '9';
}
@Override @Override
protected boolean onLongPress(Key key) { protected boolean onLongPress(Key key) {
if (key.codes[0] == KEYCODE_OPTIONS) { int primaryCode = key.codes[0];
if (primaryCode == KEYCODE_OPTIONS) {
getOnKeyboardActionListener().onKey(KEYCODE_OPTIONS_LONGPRESS, null, getOnKeyboardActionListener().onKey(KEYCODE_OPTIONS_LONGPRESS, null,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE, LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE); LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE);
return true; return true;
} else if (key.codes[0] == '0' && getKeyboard() == mPhoneKeyboard) { } else if (primaryCode == '0' && getKeyboard() == mPhoneKeyboard) {
// Long pressing on 0 in phone number keypad gives you a '+'. // Long pressing on 0 in phone number keypad gives you a '+'.
getOnKeyboardActionListener().onKey( getOnKeyboardActionListener().onKey(
'+', null, LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE, '+', null,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE);
return true;
} else if (hasOneDigitAlternate(key)) {
mKeyCodes[0] = primaryCode = key.popupCharacters.charAt(0);
// when there is only one alternate character, send it as key action.
getOnKeyboardActionListener().onKey(primaryCode, mKeyCodes,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE); LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE);
return true; return true;
} else { } else {
@ -121,10 +144,10 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
* that could be due to a multi-touch being treated as a move by the firmware or hardware. * that could be due to a multi-touch being treated as a move by the firmware or hardware.
* Once a sudden jump is detected, all subsequent move events are discarded * Once a sudden jump is detected, all subsequent move events are discarded
* until an UP is received.<P> * until an UP is received.<P>
* When a sudden jump is detected, an UP event is simulated at the last position and when * When a sudden jump is detected, an UP event is simulated at the last position and when
* the sudden moves subside, a DOWN event is simulated for the second key. * the sudden moves subside, a DOWN event is simulated for the second key.
* @param me the motion event * @param me the motion event
* @return true if the event was consumed, so that it doesn't continue to be handled by * @return true if the event was consumed, so that it doesn't continue to be handled by
* KeyboardView. * KeyboardView.
*/ */
private boolean handleSuddenJump(MotionEvent me) { private boolean handleSuddenJump(MotionEvent me) {
@ -232,9 +255,9 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
static final boolean DEBUG_LINE = false; static final boolean DEBUG_LINE = false;
private static final int MSG_TOUCH_DOWN = 1; private static final int MSG_TOUCH_DOWN = 1;
private static final int MSG_TOUCH_UP = 2; private static final int MSG_TOUCH_UP = 2;
Handler mHandler2; Handler mHandler2;
private String mStringToPlay; private String mStringToPlay;
private int mStringIndex; private int mStringIndex;
private boolean mDownDelivered; private boolean mDownDelivered;
@ -254,7 +277,7 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
removeMessages(MSG_TOUCH_DOWN); removeMessages(MSG_TOUCH_DOWN);
removeMessages(MSG_TOUCH_UP); removeMessages(MSG_TOUCH_UP);
if (mPlaying == false) return; if (mPlaying == false) return;
switch (msg.what) { switch (msg.what) {
case MSG_TOUCH_DOWN: case MSG_TOUCH_DOWN:
if (mStringIndex >= mStringToPlay.length()) { if (mStringIndex >= mStringToPlay.length()) {
@ -262,7 +285,7 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
return; return;
} }
char c = mStringToPlay.charAt(mStringIndex); char c = mStringToPlay.charAt(mStringIndex);
while (c > 255 || mAsciiKeys[(int) c] == null) { while (c > 255 || mAsciiKeys[c] == null) {
mStringIndex++; mStringIndex++;
if (mStringIndex >= mStringToPlay.length()) { if (mStringIndex >= mStringToPlay.length()) {
mPlaying = false; mPlaying = false;
@ -272,8 +295,8 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
} }
int x = mAsciiKeys[c].x + 10; int x = mAsciiKeys[c].x + 10;
int y = mAsciiKeys[c].y + 26; int y = mAsciiKeys[c].y + 26;
MotionEvent me = MotionEvent.obtain(SystemClock.uptimeMillis(), MotionEvent me = MotionEvent.obtain(SystemClock.uptimeMillis(),
SystemClock.uptimeMillis(), SystemClock.uptimeMillis(),
MotionEvent.ACTION_DOWN, x, y, 0); MotionEvent.ACTION_DOWN, x, y, 0);
LatinKeyboardView.this.dispatchTouchEvent(me); LatinKeyboardView.this.dispatchTouchEvent(me);
me.recycle(); me.recycle();
@ -286,9 +309,9 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
int x2 = mAsciiKeys[cUp].x + 10; int x2 = mAsciiKeys[cUp].x + 10;
int y2 = mAsciiKeys[cUp].y + 26; int y2 = mAsciiKeys[cUp].y + 26;
mStringIndex++; mStringIndex++;
MotionEvent me2 = MotionEvent.obtain(SystemClock.uptimeMillis(), MotionEvent me2 = MotionEvent.obtain(SystemClock.uptimeMillis(),
SystemClock.uptimeMillis(), SystemClock.uptimeMillis(),
MotionEvent.ACTION_UP, x2, y2, 0); MotionEvent.ACTION_UP, x2, y2, 0);
LatinKeyboardView.this.dispatchTouchEvent(me2); LatinKeyboardView.this.dispatchTouchEvent(me2);
me2.recycle(); me2.recycle();
@ -309,7 +332,7 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
// Get the keys on this keyboard // Get the keys on this keyboard
for (int i = 0; i < keys.size(); i++) { for (int i = 0; i < keys.size(); i++) {
int code = keys.get(i).codes[0]; int code = keys.get(i).codes[0];
if (code >= 0 && code <= 255) { if (code >= 0 && code <= 255) {
mAsciiKeys[code] = keys.get(i); mAsciiKeys[code] = keys.get(i);
} }
} }

8
java/src/com/android/inputmethod/latin/PointerTracker.java
View File

@ -124,6 +124,8 @@ public class PointerTracker {
} }
public void updateKey(int keyIndex) { public void updateKey(int keyIndex) {
if (mKeyAlreadyProcessed)
return;
int oldKeyIndex = mPreviousKey; int oldKeyIndex = mPreviousKey;
mPreviousKey = keyIndex; mPreviousKey = keyIndex;
if (keyIndex != oldKeyIndex) { if (keyIndex != oldKeyIndex) {
@ -172,6 +174,8 @@ public class PointerTracker {
} }
public void onMoveEvent(int x, int y, long eventTime) { public void onMoveEvent(int x, int y, long eventTime) {
if (mKeyAlreadyProcessed)
return;
int keyIndex = mKeyDetector.getKeyIndexAndNearbyCodes(x, y, null); int keyIndex = mKeyDetector.getKeyIndexAndNearbyCodes(x, y, null);
if (isValidKeyIndex(keyIndex)) { if (isValidKeyIndex(keyIndex)) {
if (mCurrentKey == NOT_A_KEY) { if (mCurrentKey == NOT_A_KEY) {
@ -215,6 +219,8 @@ public class PointerTracker {
} }
public void onUpEvent(int x, int y, long eventTime) { public void onUpEvent(int x, int y, long eventTime) {
if (mKeyAlreadyProcessed)
return;
if (DEBUG) if (DEBUG)
debugLog("onUpEvent :", x, y); debugLog("onUpEvent :", x, y);
int keyIndex = mKeyDetector.getKeyIndexAndNearbyCodes(x, y, null); int keyIndex = mKeyDetector.getKeyIndexAndNearbyCodes(x, y, null);
@ -235,7 +241,7 @@ public class PointerTracker {
} }
showKeyPreviewAndUpdateKey(NOT_A_KEY); showKeyPreviewAndUpdateKey(NOT_A_KEY);
// If we're not on a repeating key (which sends on a DOWN event) // If we're not on a repeating key (which sends on a DOWN event)
if (!wasInKeyRepeat && !mKeyAlreadyProcessed) { if (!wasInKeyRepeat) {
detectAndSendKey(mCurrentKey, (int)x, (int)y, eventTime); detectAndSendKey(mCurrentKey, (int)x, (int)y, eventTime);
} }
if (isValidKeyIndex(keyIndex)) if (isValidKeyIndex(keyIndex))