From 6bfb234f294b6ad95176f987256c85e8607d23f5 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Fri, 3 Sep 2010 00:45:26 +0900 Subject: Refactor KeyDetector to share more methods Bug: 2959169 Change-Id: I87060049cad6f9d6432b6c4a246c15587ae0d837 --- .../com/android/inputmethod/latin/ProximityKeyDetector.java | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/ProximityKeyDetector.java') diff --git a/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java b/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java index 408e4e147..d17bedb56 100644 --- a/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java +++ b/java/src/com/android/inputmethod/latin/ProximityKeyDetector.java @@ -27,20 +27,15 @@ class ProximityKeyDetector extends KeyDetector { private int[] mDistances = new int[MAX_NEARBY_KEYS]; @Override - public int[] newCodeArray() { - int[] codes = new int[MAX_NEARBY_KEYS]; - Arrays.fill(codes, LatinKeyboardBaseView.NOT_A_KEY); - return codes; + protected int getMaxNearbyKeys() { + return MAX_NEARBY_KEYS; } @Override public int getKeyIndexAndNearbyCodes(int x, int y, int[] allKeys) { + final Key[] keys = getKeys(); final int touchX = getTouchX(x); final int touchY = getTouchY(y); - final Key[] keys = mKeys; - if (keys == null) - throw new IllegalStateException("keyboard isn't set"); - // mKeyboard is guaranteed not null at setKeybaord() method int primaryIndex = LatinKeyboardBaseView.NOT_A_KEY; int closestKey = LatinKeyboardBaseView.NOT_A_KEY; int closestKeyDist = mProximityThresholdSquare + 1; -- cgit v1.2.3-83-g751a