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

am e648e839: Merge "Remove eventTime argument from PointerTracker.onShowMoreKeysPanel"

Browse source 
* commit 'e648e839395de48166c961e603f08423de93fe5e':
  Remove eventTime argument from PointerTracker.onShowMoreKeysPanel
This commit is contained in:
Tadashi G. Takaoka 2011-10-26 07:30:56 -07:00 committed by Android Git Automerger
commit b6b6465e5f
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
View file

@ -21,7 +21,6 @@ import android.content.pm.PackageManager;
import android.content.res.Resources; import android.content.res.Resources;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.os.Message; import android.os.Message;
import android.os.SystemClock;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log; import android.util.Log;
import android.view.GestureDetector; import android.view.GestureDetector;
@ -452,8 +451,7 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
this, this, pointX, pointY, mMoreKeysWindow, getKeyboardActionListener()); this, this, pointX, pointY, mMoreKeysWindow, getKeyboardActionListener());
final int translatedX = moreKeysPanel.translateX(tracker.getLastX()); final int translatedX = moreKeysPanel.translateX(tracker.getLastX());
final int translatedY = moreKeysPanel.translateY(tracker.getLastY()); final int translatedY = moreKeysPanel.translateY(tracker.getLastY());
tracker.onShowMoreKeysPanel( tracker.onShowMoreKeysPanel(translatedX, translatedY, moreKeysPanel);
translatedX, translatedY, SystemClock.uptimeMillis(), moreKeysPanel);
dimEntireKeyboard(true); dimEntireKeyboard(true);
return true; return true;
} }

5
java/src/com/android/inputmethod/keyboard/PointerTracker.java
View file

@ -18,6 +18,7 @@ package com.android.inputmethod.keyboard;
import android.content.Context; import android.content.Context;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.SystemClock;
import android.util.Log; import android.util.Log;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.widget.TextView; import android.widget.TextView;
@ -615,9 +616,9 @@ public class PointerTracker {
} }
} }
public void onShowMoreKeysPanel(int x, int y, long eventTime, KeyEventHandler handler) { public void onShowMoreKeysPanel(int x, int y, KeyEventHandler handler) {
onLongPressed(); onLongPressed();
onDownEvent(x, y, eventTime, handler); onDownEvent(x, y, SystemClock.uptimeMillis(), handler);
mIsShowingMoreKeysPanel = true; mIsShowingMoreKeysPanel = true;
} }

4
java/src/com/android/inputmethod/latin/SuggestionsView.java
View file

@ -30,7 +30,6 @@ import android.graphics.drawable.BitmapDrawable;
import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.os.Message; import android.os.Message;
import android.os.SystemClock;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.Spanned; import android.text.Spanned;
@ -832,8 +831,7 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
// Decided to be in the sliding input mode only when the touch point has been moved // Decided to be in the sliding input mode only when the touch point has been moved
// upward. // upward.
mMoreSuggestionsMode = MORE_SUGGESTIONS_IN_SLIDING_MODE; mMoreSuggestionsMode = MORE_SUGGESTIONS_IN_SLIDING_MODE;
tracker.onShowMoreKeysPanel( tracker.onShowMoreKeysPanel(translatedX, translatedY, moreKeysPanel);
translatedX, translatedY, SystemClock.uptimeMillis(), moreKeysPanel);
} else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP) { } else if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_POINTER_UP) {
// Decided to be in the modal input mode // Decided to be in the modal input mode
mMoreSuggestionsMode = MORE_SUGGESTIONS_IN_MODAL_MODE; mMoreSuggestionsMode = MORE_SUGGESTIONS_IN_MODAL_MODE;