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

am 3297ee80: Merge "Long pressing mic/comma key will show settings menue" into gingerbread 

Merge commit '3297ee80f0b5b93128123d98d7f8b42257e36445' into gingerbread-plus-aosp

* commit '3297ee80f0b5b93128123d98d7f8b42257e36445':
  Long pressing mic/comma key will show settings menue
main
Tadashi G. Takaoka 2010-09-30 10:11:24 -07:00 committed by Android Git Automerger
parent 93176d869a 3297ee80f0
commit 105f7c36b7
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
java/res/values/bools.xml
View File

@ -29,4 +29,5 @@
<!-- Whether or not Popup on key press is enabled by default -->
<bool name="default_popup_preview">true</bool>
<bool name="default_recorrection_enabled">true</bool>
<bool name="config_long_press_comma_for_settings_enabled">true</bool>
</resources>

30
java/src/com/android/inputmethod/latin/LatinKeyboardView.java
View File

@ -17,6 +17,7 @@
package com.android.inputmethod.latin;
import android.content.Context;
import android.content.res.Resources;
import android.graphics.Canvas;
import android.graphics.Paint;
import android.inputmethodservice.Keyboard;
@ -41,6 +42,8 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
private Keyboard mPhoneKeyboard;
private final boolean mLongPressCommaForSettingsEnabled;
/** Whether we've started dropping move events because we found a big jump */
private boolean mDroppingEvents;
/**
@ -54,11 +57,15 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
private int mLastRowY;
public LatinKeyboardView(Context context, AttributeSet attrs) {
super(context, attrs);
this(context, attrs, 0);
}
public LatinKeyboardView(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
Resources res = context.getResources();
mLongPressCommaForSettingsEnabled = res.getBoolean(
R.bool.config_long_press_comma_for_settings_enabled);
}
public void setPhoneKeyboard(Keyboard phoneKeyboard) {
@ -90,22 +97,25 @@ public class LatinKeyboardView extends LatinKeyboardBaseView {
protected boolean onLongPress(Key key) {
int primaryCode = key.codes[0];
if (primaryCode == KEYCODE_OPTIONS) {
getOnKeyboardActionListener().onKey(KEYCODE_OPTIONS_LONGPRESS, null,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE);
return true;
return invokeOnKey(KEYCODE_OPTIONS_LONGPRESS);
} else if (primaryCode == '0' && getKeyboard() == mPhoneKeyboard) {
// Long pressing on 0 in phone number keypad gives you a '+'.
getOnKeyboardActionListener().onKey(
'+', null,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE);
return true;
return invokeOnKey('+');
} else if (primaryCode == KEYCODE_VOICE
|| (primaryCode == ',' && mLongPressCommaForSettingsEnabled)) {
return invokeOnKey(KEYCODE_OPTIONS);
} else {
return super.onLongPress(key);
}
}
private boolean invokeOnKey(int primaryCode) {
getOnKeyboardActionListener().onKey(primaryCode, null,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE,
LatinKeyboardBaseView.NOT_A_TOUCH_COORDINATE);
return true;
}
@Override
protected CharSequence adjustCase(CharSequence label) {
Keyboard keyboard = getKeyboard();