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

Merge "Remove useless key event handling methods"

Browse source
This commit is contained in:
Tadashi G. Takaoka 2012-04-17 19:58:05 -07:00 committed by Android (Google) Code Review
commit 18178fefdc
4 changed files with 0 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
java/src/com/android/inputmethod/keyboard/Keyboard.java
View file

@ -197,14 +197,6 @@ public class Keyboard {
return null;
}
// TODO: Remove this method.
public boolean isShiftedOrShiftLocked() {
// Alphabet mode have unshifted, manual shifted, automatic shifted, shift locked, and
// shift lock shifted element. So that unshifed element is the only one that is NOT in
// shifted or shift locked state.
return mId.isAlphabetKeyboard() && mId.mElementId != KeyboardId.ELEMENT_ALPHABET;
}
public static boolean isLetterCode(int code) {
return code >= MINIMUM_LETTER_CODE;
}

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

@ -790,10 +790,6 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
return false;
}
public boolean handleBack() {
return dismissMoreKeysPanel();
}
@Override
public void draw(Canvas c) {
Utils.GCUtils.getInstance().reset();

45
java/src/com/android/inputmethod/latin/LatinIME.java
View file

@ -40,7 +40,6 @@ import android.text.TextUtils;
import android.util.Log;
import android.util.PrintWriterPrinter;
import android.util.Printer;
import android.view.KeyEvent;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewGroup.LayoutParams;
@ -1009,50 +1008,6 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
mKeyPreviewBackingView.setVisibility(isFullscreenMode() ? View.GONE : View.VISIBLE);
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
switch (keyCode) {
case KeyEvent.KEYCODE_BACK:
if (event.getRepeatCount() == 0) {
if (mSuggestionsView != null && mSuggestionsView.handleBack()) {
return true;
}
final LatinKeyboardView keyboardView = mKeyboardSwitcher.getKeyboardView();
if (keyboardView != null && keyboardView.handleBack()) {
return true;
}
}
break;
}
return super.onKeyDown(keyCode, event);
}
@Override
public boolean onKeyUp(int keyCode, KeyEvent event) {
switch (keyCode) {
case KeyEvent.KEYCODE_DPAD_DOWN:
case KeyEvent.KEYCODE_DPAD_UP:
case KeyEvent.KEYCODE_DPAD_LEFT:
case KeyEvent.KEYCODE_DPAD_RIGHT:
final LatinKeyboardView keyboardView = mKeyboardSwitcher.getKeyboardView();
final Keyboard keyboard = mKeyboardSwitcher.getKeyboard();
// Enable shift key and DPAD to do selections
if ((keyboardView != null && keyboardView.isShown())
&& (keyboard != null && keyboard.isShiftedOrShiftLocked())) {
KeyEvent newEvent = new KeyEvent(event.getDownTime(), event.getEventTime(),
event.getAction(), event.getKeyCode(), event.getRepeatCount(),
event.getDeviceId(), event.getScanCode(),
KeyEvent.META_SHIFT_LEFT_ON | KeyEvent.META_SHIFT_ON);
final InputConnection ic = getCurrentInputConnection();
if (ic != null)
ic.sendKeyEvent(newEvent);
return true;
}
break;
}
return super.onKeyUp(keyCode, event);
}
// This will reset the whole input state to the starting state. It will clear
// the composing word, reset the last composed word, tell the inputconnection
// and the composingStateManager about it.

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

@ -746,10 +746,6 @@ public class SuggestionsView extends RelativeLayout implements OnClickListener,
return false;
}
public boolean handleBack() {
return dismissMoreSuggestions();
}
@Override
public boolean onLongClick(View view) {
return showMoreSuggestions();