From 06993cb0197c0b3f1f06b367d57e15c6be8b20f4 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Fri, 16 Nov 2012 17:49:22 -0800 Subject: [PATCH 1/5] Revert "Only add spaces automatically when appropriate." This reverts commit 6ce66d1c7d4a5be9c6ed33e4f881994283d5eee9 Change-Id: I90004a5fea0bc7999ecf8742f883ff4dac264d8a bug: 7565414 --- .../inputmethod/latin/InputAttributes.java | 5 ---- .../inputmethod/latin/InputTypeUtils.java | 28 ++++++------------- .../android/inputmethod/latin/LatinIME.java | 4 +-- .../inputmethod/latin/SettingsValues.java | 4 --- 4 files changed, 10 insertions(+), 31 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/InputAttributes.java b/java/src/com/android/inputmethod/latin/InputAttributes.java index ed0aedbc4..2f7608a03 100644 --- a/java/src/com/android/inputmethod/latin/InputAttributes.java +++ b/java/src/com/android/inputmethod/latin/InputAttributes.java @@ -65,7 +65,6 @@ public final class InputAttributes { final boolean flagAutoComplete = 0 != (inputType & InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE); - // TODO: Have a helper method in InputTypeUtils // Make sure that passwords are not displayed in {@link SuggestionStripView}. if (InputTypeUtils.isPasswordInputType(inputType) || InputTypeUtils.isVisiblePasswordInputType(inputType) @@ -162,10 +161,6 @@ public final class InputAttributes { Log.i(TAG, " TYPE_TEXT_FLAG_AUTO_COMPLETE"); } - public boolean shouldInsertSpacesAutomatically() { - return InputTypeUtils.isAutoSpaceFriendlyType(mInputType); - } - // Pretty print @Override public String toString() { diff --git a/java/src/com/android/inputmethod/latin/InputTypeUtils.java b/java/src/com/android/inputmethod/latin/InputTypeUtils.java index f1b413163..500866a13 100644 --- a/java/src/com/android/inputmethod/latin/InputTypeUtils.java +++ b/java/src/com/android/inputmethod/latin/InputTypeUtils.java @@ -29,37 +29,31 @@ public final class InputTypeUtils implements InputType { TYPE_CLASS_TEXT | TYPE_TEXT_VARIATION_PASSWORD; private static final int TEXT_VISIBLE_PASSWORD_INPUT_TYPE = TYPE_CLASS_TEXT | TYPE_TEXT_VARIATION_VISIBLE_PASSWORD; - private static final int SUPPRESSING_AUTO_SPACES_FIELD_TYPE = - InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS - | InputType.TYPE_TEXT_VARIATION_PASSWORD - | InputType.TYPE_TEXT_VARIATION_URI - | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD - | InputType.TYPE_TEXT_VARIATION_WEB_PASSWORD; private InputTypeUtils() { // This utility class is not publicly instantiable. } - private static boolean isWebEditTextInputType(final int inputType) { + private static boolean isWebEditTextInputType(int inputType) { return inputType == (TYPE_CLASS_TEXT | TYPE_TEXT_VARIATION_WEB_EDIT_TEXT); } - private static boolean isWebPasswordInputType(final int inputType) { + private static boolean isWebPasswordInputType(int inputType) { return WEB_TEXT_PASSWORD_INPUT_TYPE != 0 && inputType == WEB_TEXT_PASSWORD_INPUT_TYPE; } - private static boolean isWebEmailAddressInputType(final int inputType) { + private static boolean isWebEmailAddressInputType(int inputType) { return WEB_TEXT_EMAIL_ADDRESS_INPUT_TYPE != 0 && inputType == WEB_TEXT_EMAIL_ADDRESS_INPUT_TYPE; } - private static boolean isNumberPasswordInputType(final int inputType) { + private static boolean isNumberPasswordInputType(int inputType) { return NUMBER_PASSWORD_INPUT_TYPE != 0 && inputType == NUMBER_PASSWORD_INPUT_TYPE; } - private static boolean isTextPasswordInputType(final int inputType) { + private static boolean isTextPasswordInputType(int inputType) { return inputType == TEXT_PASSWORD_INPUT_TYPE; } @@ -67,12 +61,12 @@ public final class InputTypeUtils implements InputType { return variation == TYPE_TEXT_VARIATION_WEB_EMAIL_ADDRESS; } - public static boolean isEmailVariation(final int variation) { + public static boolean isEmailVariation(int variation) { return variation == TYPE_TEXT_VARIATION_EMAIL_ADDRESS || isWebEmailAddressVariation(variation); } - public static boolean isWebInputType(final int inputType) { + public static boolean isWebInputType(int inputType) { final int maskedInputType = inputType & (TYPE_MASK_CLASS | TYPE_MASK_VARIATION); return isWebEditTextInputType(maskedInputType) || isWebPasswordInputType(maskedInputType) @@ -80,7 +74,7 @@ public final class InputTypeUtils implements InputType { } // Please refer to TextView.isPasswordInputType - public static boolean isPasswordInputType(final int inputType) { + public static boolean isPasswordInputType(int inputType) { final int maskedInputType = inputType & (TYPE_MASK_CLASS | TYPE_MASK_VARIATION); return isTextPasswordInputType(maskedInputType) || isWebPasswordInputType(maskedInputType) @@ -88,13 +82,9 @@ public final class InputTypeUtils implements InputType { } // Please refer to TextView.isVisiblePasswordInputType - public static boolean isVisiblePasswordInputType(final int inputType) { + public static boolean isVisiblePasswordInputType(int inputType) { final int maskedInputType = inputType & (TYPE_MASK_CLASS | TYPE_MASK_VARIATION); return maskedInputType == TEXT_VISIBLE_PASSWORD_INPUT_TYPE; } - - public static boolean isAutoSpaceFriendlyType(final int inputType) { - return 0 == (inputType & SUPPRESSING_AUTO_SPACES_FIELD_TYPE); - } } diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index f416396e8..ddfc27310 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -2257,9 +2257,7 @@ public final class LatinIME extends InputMethodService implements KeyboardAction // This essentially inserts a space, and that's it. public void promotePhantomSpace() { - if (mCurrentSettings.shouldInsertSpacesAutomatically()) { - sendKeyCodePoint(Keyboard.CODE_SPACE); - } + sendKeyCodePoint(Keyboard.CODE_SPACE); } // Used by the RingCharBuffer diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java index 6bf37aa92..2a778aa0d 100644 --- a/java/src/com/android/inputmethod/latin/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/SettingsValues.java @@ -271,10 +271,6 @@ public final class SettingsValues { return mPhantomSpacePromotingSymbols.contains(String.valueOf((char)code)); } - public boolean shouldInsertSpacesAutomatically() { - return mInputAttributes.shouldInsertSpacesAutomatically(); - } - private static boolean isAutoCorrectEnabled(final Resources res, final String currentAutoCorrectionSetting) { final String autoCorrectionOff = res.getString( From f5a194b6af12ac4282ee2b00c7db100de77260cc Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Fri, 16 Nov 2012 18:17:10 -0800 Subject: [PATCH 2/5] Revert "Correctly add double quote to the space strippers" This reverts commit af7264abb7abfc0dab08d332b10b9ec8a6b48dc6 Change-Id: I5673103c4a0e9c48df563187d2188ca6e2f15877 bug: 7561815 --- java/res/values-fr/donottranslate.xml | 2 +- java/res/values/donottranslate.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/java/res/values-fr/donottranslate.xml b/java/res/values-fr/donottranslate.xml index 10feb710f..5288bd7d1 100644 --- a/java/res/values-fr/donottranslate.xml +++ b/java/res/values-fr/donottranslate.xml @@ -21,7 +21,7 @@ .,\")]} - \'\n-/_\" + " \'\n-/_" ;:!?([*&@{<>+=| diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index f7802a8c8..9e07b2248 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -23,7 +23,7 @@ .,;:!?)]}\" - \n/_\'-\"@ + " \n/_\'-"@ ([*&{<>+=| From 2db9e1c447a71f0aec3067697cf294f711a9e4e0 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Wed, 28 Nov 2012 14:34:48 +0900 Subject: [PATCH 3/5] Fix typo in method name This is a follow up of I6f851248. Change-Id: I3fe17f3c81ed35e7c38ac9701e73c6b2c1ca8d63 --- .../com/android/inputmethod/keyboard/MainKeyboardView.java | 4 ++-- .../com/android/inputmethod/keyboard/PointerTracker.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java index b09f9b20c..7e9e3ce1a 100644 --- a/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MainKeyboardView.java @@ -369,13 +369,13 @@ public final class MainKeyboardView extends KeyboardView implements PointerTrack } @Override - public void cancelAllUpdateBatchInputTimer() { + public void cancelAllUpdateBatchInputTimers() { removeMessages(MSG_UPDATE_BATCH_INPUT); } public void cancelAllMessages() { cancelKeyTimers(); - cancelAllUpdateBatchInputTimer(); + cancelAllUpdateBatchInputTimers(); } } diff --git a/java/src/com/android/inputmethod/keyboard/PointerTracker.java b/java/src/com/android/inputmethod/keyboard/PointerTracker.java index bd4a713ec..296a45faf 100644 --- a/java/src/com/android/inputmethod/keyboard/PointerTracker.java +++ b/java/src/com/android/inputmethod/keyboard/PointerTracker.java @@ -95,7 +95,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { public boolean isInDoubleTapTimeout(); public void cancelKeyTimers(); public void startUpdateBatchInputTimer(PointerTracker tracker); - public void cancelAllUpdateBatchInputTimer(); + public void cancelAllUpdateBatchInputTimers(); public static class Adapter implements TimerProxy { @Override @@ -121,7 +121,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { @Override public void startUpdateBatchInputTimer(PointerTracker tracker) {} @Override - public void cancelAllUpdateBatchInputTimer() {} + public void cancelAllUpdateBatchInputTimers() {} } } @@ -754,7 +754,7 @@ public final class PointerTracker implements PointerTrackerQueue.Element { Log.d(TAG, String.format("[%d] onEndBatchInput : batchPoints=%d", mPointerId, sAggregratedPointers.getPointerSize())); } - mTimerProxy.cancelAllUpdateBatchInputTimer(); + mTimerProxy.cancelAllUpdateBatchInputTimers(); mListener.onEndBatchInput(sAggregratedPointers); } } From 85e397cd1060f3878d9a55373b7409641175179a Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Wed, 28 Nov 2012 13:28:18 +0900 Subject: [PATCH 4/5] Set additional subtypes before getting current subtype Bug: 7594188 Change-Id: I1977acb7189f8eb186b9b20a3e5b64b4aaabf191 --- .../latin/AdditionalSubtypeSettings.java | 5 ++-- .../android/inputmethod/latin/LatinIME.java | 23 +++++++----------- .../latin/RichInputMethodManager.java | 24 +++++++++++++++---- .../inputmethod/latin/SettingsValues.java | 8 ------- .../keyboard/SpacebarTextTests.java | 4 +++- .../inputmethod/latin/SubtypeLocaleTests.java | 4 +++- 6 files changed, 37 insertions(+), 31 deletions(-) diff --git a/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java b/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java index 96c08b3cd..08f08d24e 100644 --- a/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java +++ b/java/src/com/android/inputmethod/latin/AdditionalSubtypeSettings.java @@ -386,12 +386,11 @@ public final class AdditionalSubtypeSettings extends PreferenceFragment { public void onCreate(final Bundle savedInstanceState) { super.onCreate(savedInstanceState); - RichInputMethodManager.init(getActivity()); + mPrefs = getPreferenceManager().getSharedPreferences(); + RichInputMethodManager.init(getActivity(), mPrefs); mRichImm = RichInputMethodManager.getInstance(); addPreferencesFromResource(R.xml.additional_subtype_settings); setHasOptionsMenu(true); - - mPrefs = getPreferenceManager().getSharedPreferences(); } @Override diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java index dc3ad4ff0..0b49659e3 100644 --- a/java/src/com/android/inputmethod/latin/LatinIME.java +++ b/java/src/com/android/inputmethod/latin/LatinIME.java @@ -403,33 +403,28 @@ public final class LatinIME extends InputMethodService implements KeyboardAction @Override public void onCreate() { - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); - mPrefs = prefs; - LatinImeLogger.init(this, prefs); + mPrefs = PreferenceManager.getDefaultSharedPreferences(this); + mResources = getResources(); + + LatinImeLogger.init(this, mPrefs); if (ProductionFlag.IS_EXPERIMENTAL) { - ResearchLogger.getInstance().init(this, prefs); + ResearchLogger.getInstance().init(this, mPrefs); } - RichInputMethodManager.init(this); + RichInputMethodManager.init(this, mPrefs); + mRichImm = RichInputMethodManager.getInstance(); SubtypeSwitcher.init(this); - KeyboardSwitcher.init(this, prefs); + KeyboardSwitcher.init(this, mPrefs); AccessibilityUtils.init(this); super.onCreate(); - mRichImm = RichInputMethodManager.getInstance(); mHandler.onCreate(); DEBUG = LatinImeLogger.sDBG; - final Resources res = getResources(); - mResources = res; - loadSettings(); - - mRichImm.setAdditionalInputMethodSubtypes(mCurrentSettings.getAdditionalSubtypes()); - initSuggest(); - mDisplayOrientation = res.getConfiguration().orientation; + mDisplayOrientation = mResources.getConfiguration().orientation; // Register to receive ringer mode change and network state change. // Also receive installation and removal of a dictionary pack. diff --git a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java index 63dfd3250..af0d61cc7 100644 --- a/java/src/com/android/inputmethod/latin/RichInputMethodManager.java +++ b/java/src/com/android/inputmethod/latin/RichInputMethodManager.java @@ -19,6 +19,7 @@ package com.android.inputmethod.latin; import static com.android.inputmethod.latin.Constants.Subtype.KEYBOARD_MODE; import android.content.Context; +import android.content.SharedPreferences; import android.os.IBinder; import android.view.inputmethod.InputMethodInfo; import android.view.inputmethod.InputMethodManager; @@ -49,19 +50,34 @@ public final class RichInputMethodManager { return sInstance; } - public static void init(final Context context) { - sInstance.initInternal(context); + public static void init(final Context context, final SharedPreferences prefs) { + sInstance.initInternal(context, prefs); + } + + private boolean isInitialized() { + return mImmWrapper != null; } private void checkInitialized() { - if (mImmWrapper == null) { + if (!isInitialized()) { throw new RuntimeException(TAG + " is used before initialization"); } } - private void initInternal(final Context context) { + private void initInternal(final Context context, final SharedPreferences prefs) { + if (isInitialized()) { + return; + } mImmWrapper = new InputMethodManagerCompatWrapper(context); mInputMethodInfoOfThisIme = getInputMethodInfoOfThisIme(context); + + // Initialize additional subtypes. + SubtypeLocale.init(context); + final String prefAdditionalSubtypes = SettingsValues.getPrefAdditionalSubtypes( + prefs, context.getResources()); + final InputMethodSubtype[] additionalSubtypes = + AdditionalSubtype.createAdditionalSubtypesArray(prefAdditionalSubtypes); + setAdditionalInputMethodSubtypes(additionalSubtypes); } public InputMethodManager getInputMethodManager() { diff --git a/java/src/com/android/inputmethod/latin/SettingsValues.java b/java/src/com/android/inputmethod/latin/SettingsValues.java index d6daa0d26..8de64c1c9 100644 --- a/java/src/com/android/inputmethod/latin/SettingsValues.java +++ b/java/src/com/android/inputmethod/latin/SettingsValues.java @@ -22,7 +22,6 @@ import android.content.res.Configuration; import android.content.res.Resources; import android.util.Log; import android.view.inputmethod.EditorInfo; -import android.view.inputmethod.InputMethodSubtype; import com.android.inputmethod.keyboard.internal.KeySpecParser; import com.android.inputmethod.latin.SuggestedWords.SuggestedWordInfo; @@ -82,7 +81,6 @@ public final class SettingsValues { private final int mVibrationDurationSettingsRawValue; @SuppressWarnings("unused") // TODO: Use this private final float mKeypressSoundVolumeRawValue; - private final InputMethodSubtype[] mAdditionalSubtypes; public final boolean mGestureInputEnabled; public final boolean mGesturePreviewTrailEnabled; public final boolean mGestureFloatingPreviewTextEnabled; @@ -170,8 +168,6 @@ public final class SettingsValues { mAutoCorrectionThresholdRawValue); mVoiceKeyEnabled = mVoiceMode != null && !mVoiceMode.equals(voiceModeOff); mVoiceKeyOnMain = mVoiceMode != null && mVoiceMode.equals(voiceModeMain); - mAdditionalSubtypes = AdditionalSubtype.createAdditionalSubtypesArray( - getPrefAdditionalSubtypes(prefs, res)); final boolean gestureInputEnabledByBuildConfig = res.getBoolean( R.bool.config_gesture_input_enabled_by_build_config); mGestureInputEnabled = gestureInputEnabledByBuildConfig @@ -375,10 +371,6 @@ public final class SettingsValues { return res.getBoolean(R.bool.config_use_fullscreen_mode); } - public InputMethodSubtype[] getAdditionalSubtypes() { - return mAdditionalSubtypes; - } - public static String getPrefAdditionalSubtypes(final SharedPreferences prefs, final Resources res) { final String predefinedPrefSubtypes = AdditionalSubtype.createPrefSubtypes( diff --git a/tests/src/com/android/inputmethod/keyboard/SpacebarTextTests.java b/tests/src/com/android/inputmethod/keyboard/SpacebarTextTests.java index 015c2711c..de323b0d7 100644 --- a/tests/src/com/android/inputmethod/keyboard/SpacebarTextTests.java +++ b/tests/src/com/android/inputmethod/keyboard/SpacebarTextTests.java @@ -18,6 +18,7 @@ package com.android.inputmethod.keyboard; import android.content.Context; import android.content.res.Resources; +import android.preference.PreferenceManager; import android.test.AndroidTestCase; import android.view.inputmethod.InputMethodSubtype; @@ -41,7 +42,8 @@ public class SpacebarTextTests extends AndroidTestCase { protected void setUp() throws Exception { super.setUp(); final Context context = getContext(); - RichInputMethodManager.init(context); + RichInputMethodManager.init( + context, PreferenceManager.getDefaultSharedPreferences(context)); mRichImm = RichInputMethodManager.getInstance(); mRes = context.getResources(); SubtypeLocale.init(context); diff --git a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java index 4e81de668..0f6fb7371 100644 --- a/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java +++ b/tests/src/com/android/inputmethod/latin/SubtypeLocaleTests.java @@ -18,6 +18,7 @@ package com.android.inputmethod.latin; import android.content.Context; import android.content.res.Resources; +import android.preference.PreferenceManager; import android.test.AndroidTestCase; import android.view.inputmethod.InputMethodSubtype; @@ -37,7 +38,8 @@ public class SubtypeLocaleTests extends AndroidTestCase { protected void setUp() throws Exception { super.setUp(); final Context context = getContext(); - RichInputMethodManager.init(context); + RichInputMethodManager.init( + context, PreferenceManager.getDefaultSharedPreferences(context)); mRichImm = RichInputMethodManager.getInstance(); mRes = context.getResources(); SubtypeLocale.init(context); From 359c35e0f6e534d096efc1d9f2ff585139e3b3ac Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Wed, 28 Nov 2012 17:25:23 +0900 Subject: [PATCH 5/5] Add CoordinateUtils class Change-Id: I23784117f77da54ee2a0670e65d86e26d762a687 --- .../AccessibilityEntityProvider.java | 6 ++- .../inputmethod/keyboard/KeyboardView.java | 16 +++++--- .../keyboard/MoreKeysKeyboardView.java | 5 ++- .../inputmethod/latin/CoordinateUtils.java | 39 +++++++++++++++++++ .../suggestions/MoreSuggestionsView.java | 5 ++- 5 files changed, 59 insertions(+), 12 deletions(-) create mode 100644 java/src/com/android/inputmethod/latin/CoordinateUtils.java diff --git a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java b/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java index b9b6362fc..0ab84f7b5 100644 --- a/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java +++ b/java/src/com/android/inputmethod/accessibility/AccessibilityEntityProvider.java @@ -36,6 +36,7 @@ import com.android.inputmethod.keyboard.Key; import com.android.inputmethod.keyboard.Keyboard; import com.android.inputmethod.keyboard.KeyboardView; import com.android.inputmethod.latin.CollectionUtils; +import com.android.inputmethod.latin.CoordinateUtils; /** * Exposes a virtual view sub-tree for {@link KeyboardView} and generates @@ -62,7 +63,7 @@ public final class AccessibilityEntityProvider extends AccessibilityNodeProvider private final Rect mTempBoundsInScreen = new Rect(); /** The parent view's cached on-screen location. */ - private final int[] mParentLocation = new int[2]; + private final int[] mParentLocation = CoordinateUtils.newInstance(); /** The virtual view identifier for the focused node. */ private int mAccessibilityFocusedView = UNDEFINED; @@ -180,7 +181,8 @@ public final class AccessibilityEntityProvider extends AccessibilityNodeProvider // Calculate the key's in-screen bounds. mTempBoundsInScreen.set(boundsInParent); - mTempBoundsInScreen.offset(mParentLocation[0], mParentLocation[1]); + mTempBoundsInScreen.offset( + CoordinateUtils.x(mParentLocation), CoordinateUtils.y(mParentLocation)); final Rect boundsInScreen = mTempBoundsInScreen; diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardView.java b/java/src/com/android/inputmethod/keyboard/KeyboardView.java index 472f74b12..d7cb5aa92 100644 --- a/java/src/com/android/inputmethod/keyboard/KeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/KeyboardView.java @@ -45,6 +45,7 @@ import com.android.inputmethod.keyboard.internal.KeyVisualAttributes; import com.android.inputmethod.keyboard.internal.PreviewPlacerView; import com.android.inputmethod.latin.CollectionUtils; import com.android.inputmethod.latin.Constants; +import com.android.inputmethod.latin.CoordinateUtils; import com.android.inputmethod.latin.LatinImeLogger; import com.android.inputmethod.latin.R; import com.android.inputmethod.latin.StaticInnerHandlerWrapper; @@ -134,7 +135,7 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { // Preview placer view private final PreviewPlacerView mPreviewPlacerView; - private final int[] mCoordinates = new int[2]; + private final int[] mCoordinates = CoordinateUtils.newInstance(); // Key preview private static final int PREVIEW_ALPHA = 240; @@ -832,10 +833,10 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { // In transient state. return; } - final int[] viewOrigin = new int[2]; + final int[] viewOrigin = CoordinateUtils.newInstance(); getLocationInWindow(viewOrigin); final DisplayMetrics dm = getResources().getDisplayMetrics(); - if (viewOrigin[1] < dm.heightPixels / 4) { + if (CoordinateUtils.y(viewOrigin) < dm.heightPixels / 4) { // In transient state. return; } @@ -850,7 +851,8 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { Log.w(TAG, "Cannot find android.R.id.content view to add PreviewPlacerView"); } else { windowContentView.addView(mPreviewPlacerView); - mPreviewPlacerView.setKeyboardViewGeometry(viewOrigin[0], viewOrigin[1], width, height); + mPreviewPlacerView.setKeyboardViewGeometry( + CoordinateUtils.x(viewOrigin), CoordinateUtils.y(viewOrigin), width, height); } } @@ -940,7 +942,8 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { // parent key. If it doesn't fit in this {@link KeyboardView}, it is moved inward to fit and // the left/right background is used if such background is specified. final int statePosition; - int previewX = key.getDrawX() - (previewWidth - keyDrawWidth) / 2 + mCoordinates[0]; + int previewX = key.getDrawX() - (previewWidth - keyDrawWidth) / 2 + + CoordinateUtils.x(mCoordinates); if (previewX < 0) { previewX = 0; statePosition = STATE_LEFT; @@ -952,7 +955,8 @@ public class KeyboardView extends View implements PointerTracker.DrawingProxy { } // The key preview is placed vertically above the top edge of the parent key with an // arbitrary offset. - final int previewY = key.mY - previewHeight + mPreviewOffset + mCoordinates[1]; + final int previewY = key.mY - previewHeight + mPreviewOffset + + CoordinateUtils.y(mCoordinates); if (background != null) { final int hasMoreKeys = (key.mMoreKeys != null) ? STATE_HAS_MOREKEYS : STATE_NORMAL; diff --git a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java index 9c450e994..a698b0bd8 100644 --- a/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java +++ b/java/src/com/android/inputmethod/keyboard/MoreKeysKeyboardView.java @@ -26,6 +26,7 @@ import android.widget.PopupWindow; import com.android.inputmethod.keyboard.PointerTracker.DrawingProxy; import com.android.inputmethod.keyboard.PointerTracker.TimerProxy; import com.android.inputmethod.latin.Constants; +import com.android.inputmethod.latin.CoordinateUtils; import com.android.inputmethod.latin.InputPointers; import com.android.inputmethod.latin.R; @@ -34,7 +35,7 @@ import com.android.inputmethod.latin.R; * detecting key presses and touch movements. */ public final class MoreKeysKeyboardView extends KeyboardView implements MoreKeysPanel { - private final int[] mCoordinates = new int[2]; + private final int[] mCoordinates = CoordinateUtils.newInstance(); private final KeyDetector mKeyDetector; @@ -169,7 +170,7 @@ public final class MoreKeysKeyboardView extends KeyboardView implements MoreKeys window.setHeight(container.getMeasuredHeight()); parentView.getLocationInWindow(mCoordinates); window.showAtLocation(parentView, Gravity.NO_GRAVITY, - x + mCoordinates[0], y + mCoordinates[1]); + x + CoordinateUtils.x(mCoordinates), y + CoordinateUtils.y(mCoordinates)); mOriginX = x + container.getPaddingLeft(); mOriginY = y + container.getPaddingTop(); diff --git a/java/src/com/android/inputmethod/latin/CoordinateUtils.java b/java/src/com/android/inputmethod/latin/CoordinateUtils.java new file mode 100644 index 000000000..cd3177299 --- /dev/null +++ b/java/src/com/android/inputmethod/latin/CoordinateUtils.java @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2012 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.inputmethod.latin; + +public final class CoordinateUtils { + private static final int INDEX_X = 0; + private static final int INDEX_Y = 1; + private static final int ARRAY_SIZE = INDEX_Y + 1; + + private CoordinateUtils() { + // This utility class is not publicly instantiable. + } + + public static int[] newInstance() { + return new int[ARRAY_SIZE]; + } + + public static int x(final int[] coords) { + return coords[INDEX_X]; + } + + public static int y(final int[] coords) { + return coords[INDEX_Y]; + } +} diff --git a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java index 6cdd9e2cd..8cc09f39b 100644 --- a/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java +++ b/java/src/com/android/inputmethod/latin/suggestions/MoreSuggestionsView.java @@ -34,6 +34,7 @@ import com.android.inputmethod.keyboard.PointerTracker; import com.android.inputmethod.keyboard.PointerTracker.DrawingProxy; import com.android.inputmethod.keyboard.PointerTracker.KeyEventHandler; import com.android.inputmethod.keyboard.PointerTracker.TimerProxy; +import com.android.inputmethod.latin.CoordinateUtils; import com.android.inputmethod.latin.R; /** @@ -41,7 +42,7 @@ import com.android.inputmethod.latin.R; * key presses and touch movements. */ public final class MoreSuggestionsView extends KeyboardView implements MoreKeysPanel { - private final int[] mCoordinates = new int[2]; + private final int[] mCoordinates = CoordinateUtils.newInstance(); final KeyDetector mModalPanelKeyDetector; private final KeyDetector mSlidingPanelKeyDetector; @@ -163,7 +164,7 @@ public final class MoreSuggestionsView extends KeyboardView implements MoreKeysP window.setHeight(container.getMeasuredHeight()); parentView.getLocationInWindow(mCoordinates); window.showAtLocation(parentView, Gravity.NO_GRAVITY, - x + mCoordinates[0], y + mCoordinates[1]); + x + CoordinateUtils.x(mCoordinates), y + CoordinateUtils.y(mCoordinates)); mOriginX = x + container.getPaddingLeft(); mOriginY = y + container.getPaddingTop();