am b52edca1: am 83b3cf56: Merge "Corresponding to TBR of Id2b0b974" into gingerbread

Merge commit 'b52edca15df778372e52986bc4f379d1b625a14a'

* commit 'b52edca15df778372e52986bc4f379d1b625a14a':
  Corresponding to TBR of Id2b0b974
main
Tadashi G. Takaoka 2010-09-02 07:26:55 -07:00 committed by Android Git Automerger
commit ac64a5c3ed
1 changed files with 2 additions and 2 deletions

View File

@ -35,8 +35,8 @@ class ProximityKeyDetector extends KeyDetector {
@Override @Override
public int getKeyIndexAndNearbyCodes(int x, int y, int[] allKeys) { public int getKeyIndexAndNearbyCodes(int x, int y, int[] allKeys) {
int touchX = getTouchX(x); final int touchX = getTouchX(x);
int touchY = getTouchY(y); final int touchY = getTouchY(y);
final Key[] keys = mKeys; final Key[] keys = mKeys;
if (keys == null) if (keys == null)
throw new IllegalStateException("keyboard isn't set"); throw new IllegalStateException("keyboard isn't set");