From 258bfe66e0fcfc89b59534a9cc7f50ff07d5f78d Mon Sep 17 00:00:00 2001 From: Yusuke Nojima Date: Wed, 28 Sep 2011 12:59:43 +0900 Subject: Classify touches into three types. Change-Id: I7c1d42835e0c15d596a1b66d421b0aa514ec0890 --- java/src/com/android/inputmethod/keyboard/ProximityInfo.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'java/src') diff --git a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java index d35b1a939..cc6feeb4a 100644 --- a/java/src/com/android/inputmethod/keyboard/ProximityInfo.java +++ b/java/src/com/android/inputmethod/keyboard/ProximityInfo.java @@ -19,6 +19,7 @@ package com.android.inputmethod.keyboard; import android.graphics.Rect; import com.android.inputmethod.keyboard.Key; +import com.android.inputmethod.latin.SubtypeSwitcher; import com.android.inputmethod.latin.Utils; import com.android.inputmethod.latin.spellcheck.SpellCheckerProximityInfo; @@ -31,6 +32,8 @@ public class ProximityInfo { /** Number of key widths from current touch point to search for nearest keys. */ private static float SEARCH_DISTANCE = 1.2f; private static final int[] EMPTY_INT_ARRAY = new int[0]; + private static final String SUPPORT_TOUCH_POSITION_CORRECTION = + "SupportTouchPositionCorrection"; private final int mKeyHeight; private final int mGridWidth; @@ -120,8 +123,10 @@ public class ProximityInfo { keyCharCodes[i] = key.mCode; } + final SubtypeSwitcher switcher = SubtypeSwitcher.getInstance(); final boolean hasTouchPositionCorrectionData = - mTouchPositionCorrectionXs != null + switcher.currentSubtypeContainsExtraValueKey(SUPPORT_TOUCH_POSITION_CORRECTION) + && mTouchPositionCorrectionXs != null && mTouchPositionCorrectionYs != null && mTouchPositionCorrectionRadii != null && mTouchPositionCorrectionXs.length > 0 -- cgit v1.2.3-83-g751a