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

am f9c6715b: Merge "Use PointerTracker.getPointerTracker() class method" 

* commit 'f9c6715b1781f31f0dc2589f9399de5009a556f2':
  Use PointerTracker.getPointerTracker() class method
main
Tadashi G. Takaoka 2012-01-25 00:53:32 -08:00 committed by Android Git Automerger
parent 71aba3d2fb f9c6715b17
commit 5d7cfc2afb
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
View File

@ -222,7 +222,8 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
if (ENABLE_CAPSLOCK_BY_DOUBLETAP && keyboard.mId.isAlphabetKeyboard()) { if (ENABLE_CAPSLOCK_BY_DOUBLETAP && keyboard.mId.isAlphabetKeyboard()) {
final int pointerIndex = firstDown.getActionIndex(); final int pointerIndex = firstDown.getActionIndex();
final int id = firstDown.getPointerId(pointerIndex); final int id = firstDown.getPointerId(pointerIndex);
final PointerTracker tracker = getPointerTracker(id); final PointerTracker tracker = PointerTracker.getPointerTracker(
id, LatinKeyboardView.this);
final Key key = tracker.getKeyOn((int)firstDown.getX(), (int)firstDown.getY()); final Key key = tracker.getKeyOn((int)firstDown.getX(), (int)firstDown.getY());
// If the first down event is on shift key. // If the first down event is on shift key.
if (key != null && key.isShift()) { if (key != null && key.isShift()) {
@ -241,7 +242,8 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
final MotionEvent secondDown = secondTap; final MotionEvent secondDown = secondTap;
final int pointerIndex = secondDown.getActionIndex(); final int pointerIndex = secondDown.getActionIndex();
final int id = secondDown.getPointerId(pointerIndex); final int id = secondDown.getPointerId(pointerIndex);
final PointerTracker tracker = getPointerTracker(id); final PointerTracker tracker = PointerTracker.getPointerTracker(
id, LatinKeyboardView.this);
final Key key = tracker.getKeyOn((int)secondDown.getX(), (int)secondDown.getY()); final Key key = tracker.getKeyOn((int)secondDown.getX(), (int)secondDown.getY());
// If the second down event is also on shift key. // If the second down event is also on shift key.
if (key != null && key.isShift()) { if (key != null && key.isShift()) {
@ -522,10 +524,6 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
return true; return true;
} }
private PointerTracker getPointerTracker(final int id) {
return PointerTracker.getPointerTracker(id, this);
}
public boolean isInSlidingKeyInput() { public boolean isInSlidingKeyInput() {
if (mMoreKeysPanel != null) { if (mMoreKeysPanel != null) {
return true; return true;
@ -609,7 +607,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
} }
if (mKeyTimerHandler.isInKeyRepeat()) { if (mKeyTimerHandler.isInKeyRepeat()) {
final PointerTracker tracker = getPointerTracker(id); final PointerTracker tracker = PointerTracker.getPointerTracker(id, this);
// Key repeating timer will be canceled if 2 or more keys are in action, and current // Key repeating timer will be canceled if 2 or more keys are in action, and current
// event (UP or DOWN) is non-modifier key. // event (UP or DOWN) is non-modifier key.
if (pointerCount > 1 && !tracker.isModifier()) { if (pointerCount > 1 && !tracker.isModifier()) {
@ -623,7 +621,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
// multi-touch panel. // multi-touch panel.
if (nonDistinctMultitouch) { if (nonDistinctMultitouch) {
// Use only main (id=0) pointer tracker. // Use only main (id=0) pointer tracker.
PointerTracker tracker = getPointerTracker(0); final PointerTracker tracker = PointerTracker.getPointerTracker(0, this);
if (pointerCount == 1 && oldPointerCount == 2) { if (pointerCount == 1 && oldPointerCount == 2) {
// Multi-touch to single touch transition. // Multi-touch to single touch transition.
// Send a down event for the latest pointer if the key is different from the // Send a down event for the latest pointer if the key is different from the
@ -652,7 +650,8 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
if (action == MotionEvent.ACTION_MOVE) { if (action == MotionEvent.ACTION_MOVE) {
for (int i = 0; i < pointerCount; i++) { for (int i = 0; i < pointerCount; i++) {
final PointerTracker tracker = getPointerTracker(me.getPointerId(i)); final PointerTracker tracker = PointerTracker.getPointerTracker(
me.getPointerId(i), this);
final int px, py; final int px, py;
if (mMoreKeysPanel != null if (mMoreKeysPanel != null
&& tracker.mPointerId == mMoreKeysPanelPointerTrackerId) { && tracker.mPointerId == mMoreKeysPanelPointerTrackerId) {
@ -669,7 +668,8 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
} }
} }
} else { } else {
getPointerTracker(id).processMotionEvent(action, x, y, eventTime, this); final PointerTracker tracker = PointerTracker.getPointerTracker(id, this);
tracker.processMotionEvent(action, x, y, eventTime, this);
} }
return true; return true;
@ -739,7 +739,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
*/ */
public boolean dispatchHoverEvent(MotionEvent event) { public boolean dispatchHoverEvent(MotionEvent event) {
if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) { if (AccessibilityUtils.getInstance().isTouchExplorationEnabled()) {
final PointerTracker tracker = getPointerTracker(0); final PointerTracker tracker = PointerTracker.getPointerTracker(0, this);
return AccessibleKeyboardViewProxy.getInstance().dispatchHoverEvent(event, tracker); return AccessibleKeyboardViewProxy.getInstance().dispatchHoverEvent(event, tracker);
} }