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

am e2af9b7e: Merge "Reset vertical correction when more suggestions are in modal mode" 

* commit 'e2af9b7eb519126e67fb054e8bd5064049958feb':
  Reset vertical correction when more suggestions are in modal mode
main
Tadashi G. Takaoka 2013-04-14 22:00:05 -07:00 committed by Android Git Automerger
parent 6223d82312 e2af9b7eb5
commit 18414333d4
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ import com.android.inputmethod.latin.R;
public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel { public class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel {
private final int[] mCoordinates = CoordinateUtils.newInstance(); private final int[] mCoordinates = CoordinateUtils.newInstance();
private final KeyDetector mKeyDetector; protected final KeyDetector mKeyDetector;
private Controller mController; private Controller mController;
protected KeyboardActionListener mListener; protected KeyboardActionListener mListener;
private int mOriginX; private int mOriginX;

6
java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java
View File

@ -46,6 +46,12 @@ public final class MoreSuggestionsView extends MoreKeysKeyboardView {
updateKeyDrawParams(keyHeight); updateKeyDrawParams(keyHeight);
} }
public void adjustVerticalCorrectionForModalMode() {
// Set vertical correction to zero (Reset more keys keyboard sliding allowance
// {@link R#dimen.more_keys_keyboard_slide_allowance}).
mKeyDetector.setKeyboard(getKeyboard(), -getPaddingLeft(), -getPaddingTop());
}
@Override @Override
public void onCodeInput(final int code, final int x, final int y) { public void onCodeInput(final int code, final int x, final int y) {
final int index = code - MoreSuggestions.SUGGESTION_CODE_BASE; final int index = code - MoreSuggestions.SUGGESTION_CODE_BASE;

4
java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
View File

@ -755,8 +755,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
@Override @Override
public boolean dispatchTouchEvent(final MotionEvent me) { public boolean dispatchTouchEvent(final MotionEvent me) {
if (!mMoreSuggestionsView.isShowingInParent() if (!mMoreSuggestionsView.isShowingInParent()) {
|| mMoreSuggestionsMode == MORE_SUGGESTIONS_IN_MODAL_MODE) {
mLastX = (int)me.getX(); mLastX = (int)me.getX();
mLastY = (int)me.getY(); mLastY = (int)me.getY();
if (mMoreSuggestionsSlidingDetector.onTouchEvent(me)) { if (mMoreSuggestionsSlidingDetector.onTouchEvent(me)) {
@ -784,6 +783,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
} 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;
mMoreSuggestionsView.adjustVerticalCorrectionForModalMode();
} }
return true; return true;
} }