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

am 3fc4ddec: Sliding suggestions strip starts showing more suggestions 

* commit '3fc4ddec68b4f56f53ed6da80b5e44f38c085740':
  Sliding suggestions strip starts showing more suggestions
main
Tadashi G. Takaoka 2011-09-20 19:33:40 -07:00 committed by Android Git Automerger
parent 8c8d1dfb97 3fc4ddec68
commit 2d5326e709
1 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
java/src/com/android/inputmethod/latin/SuggestionsView.java
View File

@ -41,6 +41,7 @@ import android.text.style.ForegroundColorSpan;
import android.text.style.StyleSpan; import android.text.style.StyleSpan;
import android.text.style.UnderlineSpan; import android.text.style.UnderlineSpan;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.GestureDetector;
import android.view.Gravity; import android.view.Gravity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent; import android.view.MotionEvent;
@ -547,6 +548,8 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
final Resources res = context.getResources(); final Resources res = context.getResources();
mMoreSuggestionsModalTolerance = res.getDimensionPixelOffset( mMoreSuggestionsModalTolerance = res.getDimensionPixelOffset(
R.dimen.more_suggestions_modal_tolerance); R.dimen.more_suggestions_modal_tolerance);
mMoreSuggestionsSlidingDetector = new GestureDetector(
context, mMoreSuggestionsSlidingListener);
} }
private final View.OnTouchListener mMoreSuggestionsCanceller = new View.OnTouchListener() { private final View.OnTouchListener mMoreSuggestionsCanceller = new View.OnTouchListener() {
@ -791,6 +794,10 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
@Override @Override
public boolean onLongClick(View view) { public boolean onLongClick(View view) {
return showMoreSuggestions();
}
private boolean showMoreSuggestions() {
final SuggestionsViewParams params = mParams; final SuggestionsViewParams params = mParams;
if (params.mMoreSuggestionsAvailable) { if (params.mMoreSuggestionsAvailable) {
final int stripWidth = getWidth(); final int stripWidth = getWidth();
@ -814,9 +821,11 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
mMoreSuggestionsMode = MORE_SUGGESTIONS_CHECKING_MODAL_OR_SLIDING; mMoreSuggestionsMode = MORE_SUGGESTIONS_CHECKING_MODAL_OR_SLIDING;
mOriginX = mLastX; mOriginX = mLastX;
mOriginY = mLastY; mOriginY = mLastY;
view.setPressed(false);
mKeyboardView.dimEntireKeyboard(true); mKeyboardView.dimEntireKeyboard(true);
mKeyboardView.setOnTouchListener(mMoreSuggestionsCanceller); mKeyboardView.setOnTouchListener(mMoreSuggestionsCanceller);
for (int i = 0; i < params.mSuggestionsCountInStrip; i++) {
mWords.get(i).setPressed(false);
}
return true; return true;
} }
return false; return false;
@ -832,6 +841,18 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
private int mOriginX; private int mOriginX;
private int mOriginY; private int mOriginY;
private final int mMoreSuggestionsModalTolerance; private final int mMoreSuggestionsModalTolerance;
private final GestureDetector mMoreSuggestionsSlidingDetector;
private final GestureDetector.OnGestureListener mMoreSuggestionsSlidingListener =
new GestureDetector.SimpleOnGestureListener() {
@Override
public boolean onScroll(MotionEvent down, MotionEvent me, float deltaX, float deltaY) {
final float dy = me.getY() - down.getY();
if (deltaY > 0 && dy < 0) {
return showMoreSuggestions();
}
return false;
}
};
@Override @Override
public boolean dispatchTouchEvent(MotionEvent me) { public boolean dispatchTouchEvent(MotionEvent me) {
@ -839,6 +860,9 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
|| mMoreSuggestionsMode == MORE_SUGGESTIONS_IN_MODAL_MODE) { || 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)) {
return true;
}
return super.dispatchTouchEvent(me); return super.dispatchTouchEvent(me);
} }