Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix KeyboardView's verticalCorrection handling"

Browse Source
This commit is contained in:
Tadashi G. Takaoka
2010-07-30 16:34:06 -07:00
committed by Android (Google) Code Review
parent 86dde2d64c 0972d071cd
commit c8f5e43719
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/inputmethodservice/KeyboardView.java
View File

@@ -1128,7 +1128,9 @@ public class KeyboardView extends View implements View.OnClickListener {
private boolean onModifiedTouchEvent(MotionEvent me, boolean possiblePoly) {
int touchX = (int) me.getX() - mPaddingLeft;
int touchY = (int) me.getY() + mVerticalCorrection - mPaddingTop;
int touchY = (int) me.getY() - mPaddingTop;
if (touchY >= -mVerticalCorrection)
touchY += mVerticalCorrection;
final int action = me.getAction();
final long eventTime = me.getEventTime();
mOldEventTime = eventTime;

27
core/res/res/xml/password_kbd_numeric.xml
View File

@@ -24,30 +24,37 @@
android:keyHeight="@dimen/password_keyboard_key_height"
>
<Row>
<Key android:codes="49" android:keyIcon="@drawable/sym_keyboard_num1" android:keyEdgeFlags="left"/>
<Row android:rowEdgeFlags="top">
<Key android:codes="49" android:keyIcon="@drawable/sym_keyboard_num1"
android:keyEdgeFlags="left"/>
<Key android:codes="50" android:keyIcon="@drawable/sym_keyboard_num2"/>
<Key android:codes="51" android:keyIcon="@drawable/sym_keyboard_num3"/>
<Key android:codes="51" android:keyIcon="@drawable/sym_keyboard_num3"
android:keyEdgeFlags="right"/>
</Row>
<Row>
<Key android:codes="52" android:keyIcon="@drawable/sym_keyboard_num4" android:keyEdgeFlags="left"/>
<Key android:codes="52" android:keyIcon="@drawable/sym_keyboard_num4"
android:keyEdgeFlags="left"/>
<Key android:codes="53" android:keyIcon="@drawable/sym_keyboard_num5"/>
<Key android:codes="54" android:keyIcon="@drawable/sym_keyboard_num6"/>
<Key android:codes="54" android:keyIcon="@drawable/sym_keyboard_num6"
android:keyEdgeFlags="right"/>
</Row>
<Row>
<Key android:codes="55" android:keyIcon="@drawable/sym_keyboard_num7" android:keyEdgeFlags="left"/>
<Key android:codes="55" android:keyIcon="@drawable/sym_keyboard_num7"
android:keyEdgeFlags="left"/>
<Key android:codes="56" android:keyIcon="@drawable/sym_keyboard_num8"/>
<Key android:codes="57" android:keyIcon="@drawable/sym_keyboard_num9"/>
<Key android:codes="57" android:keyIcon="@drawable/sym_keyboard_num9"
android:keyEdgeFlags="right"/>
</Row>
<Row android:rowEdgeFlags="bottom">
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_ok"/>
<Key android:codes="10" android:keyIcon="@drawable/sym_keyboard_ok"
android:keyEdgeFlags="left"/>
<Key android:codes="48" android:keyIcon="@drawable/sym_keyboard_num0_no_plus"/>
<Key android:codes="-5" android:keyIcon="@drawable/sym_keyboard_delete"
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
android:isRepeatable="true" android:keyEdgeFlags="right"/>
android:iconPreview="@drawable/sym_keyboard_feedback_delete"
android:isRepeatable="true" android:keyEdgeFlags="right"/>
</Row>
</Keyboard>

2
core/res/res/xml/password_kbd_symbols.xml
View File

@@ -25,7 +25,7 @@
android:keyHeight="@dimen/password_keyboard_key_height"
>
<Row>
<Row android:rowEdgeFlags="top">
<Key android:keyLabel="1" android:keyEdgeFlags="left"/>
<Key android:keyLabel="2"/>
<Key android:keyLabel="3"/>

2
core/res/res/xml/password_kbd_symbols_shift.xml
View File

@@ -25,7 +25,7 @@
android:keyHeight="@dimen/password_keyboard_key_height"
>
<Row>
<Row android:rowEdgeFlags="top">
<Key android:keyLabel="~" android:keyEdgeFlags="left"/>
<Key android:keyLabel="`"/>
<Key android:keyLabel="|"/>