From 279da1da91681923f2eba3d5e3d82f9ad87cd4b6 Mon Sep 17 00:00:00 2001 From: satok Date: Thu, 18 Nov 2010 20:48:01 +0900 Subject: Hide space bar preview when space bar switcher is disabled. Change-Id: I469197a4b3f55335eaee104177f0970cc904bb34 --- java/src/com/android/inputmethod/latin/BaseKeyboardView.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'java/src/com/android/inputmethod/latin/BaseKeyboardView.java') diff --git a/java/src/com/android/inputmethod/latin/BaseKeyboardView.java b/java/src/com/android/inputmethod/latin/BaseKeyboardView.java index 519244165..ad0e8d41a 100644 --- a/java/src/com/android/inputmethod/latin/BaseKeyboardView.java +++ b/java/src/com/android/inputmethod/latin/BaseKeyboardView.java @@ -929,10 +929,11 @@ public class BaseKeyboardView extends View implements PointerTracker.UIProxy { // the space key preview and 3) pointer moves off the space key to other letter key, we // should hide the preview of the previous key. final boolean hidePreviewOrShowSpaceKeyPreview = (tracker == null) - || tracker.isSpaceKey(keyIndex) || tracker.isSpaceKey(oldKeyIndex); + || (SubtypeSwitcher.USE_SPACEBAR_LANGUAGE_SWITCHER + && SubtypeSwitcher.getInstance().needsToDisplayLanguage() + && (tracker.isSpaceKey(keyIndex) || tracker.isSpaceKey(oldKeyIndex))); // If key changed and preview is on or the key is space (language switch is enabled) - if (oldKeyIndex != keyIndex && (mShowPreview || (hidePreviewOrShowSpaceKeyPreview - && SubtypeSwitcher.getInstance().needsToDisplayLanguage()))) { + if (oldKeyIndex != keyIndex && (mShowPreview || (hidePreviewOrShowSpaceKeyPreview))) { if (keyIndex == NOT_A_KEY) { mHandler.cancelPopupPreview(); mHandler.dismissPreview(mDelayAfterPreview); -- cgit v1.2.3-83-g751a