diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2010-09-21 08:36:47 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2010-09-21 08:36:47 -0700 |
| commit | c01d978f56f90425f070d57a66968aa77ef69a7d (patch) | |
| tree | 39e2d5b3b93750b2a0537db7ab2e7a4bc7d435c6 /java/src | |
| parent | 9c822ec48de0e6839a861212d8b7143f70b29fd1 (diff) | |
| parent | a104575c99b11e8c2df34ad11841a842f93e1172 (diff) | |
| download | latinime-c01d978f56f90425f070d57a66968aa77ef69a7d.tar.gz latinime-c01d978f56f90425f070d57a66968aa77ef69a7d.tar.xz latinime-c01d978f56f90425f070d57a66968aa77ef69a7d.zip | |
am a104575c: Merge "Draw language label on space key of symbol+alt mode" into gingerbread
Merge commit 'a104575c99b11e8c2df34ad11841a842f93e1172' into gingerbread-plus-aosp
* commit 'a104575c99b11e8c2df34ad11841a842f93e1172':
Draw language label on space key of symbol+alt mode
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/LatinKeyboard.java | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboard.java b/java/src/com/android/inputmethod/latin/LatinKeyboard.java index 1414626db..4e139e849 100644 --- a/java/src/com/android/inputmethod/latin/LatinKeyboard.java +++ b/java/src/com/android/inputmethod/latin/LatinKeyboard.java @@ -56,8 +56,8 @@ public class LatinKeyboard extends Keyboard { private Drawable mMicPreviewIcon; private Drawable m123MicIcon; private Drawable m123MicPreviewIcon; - private Drawable mButtonArrowLeftIcon; - private Drawable mButtonArrowRightIcon; + private final Drawable mButtonArrowLeftIcon; + private final Drawable mButtonArrowRightIcon; private Key mShiftKey; private Key mEnterKey; private Key mF1Key; @@ -66,15 +66,15 @@ public class LatinKeyboard extends Keyboard { private int mSpaceKeyIndex = -1; private int mSpaceDragStartX; private int mSpaceDragLastDiff; - /* package */ Locale mLocale; + private Locale mLocale; private LanguageSwitcher mLanguageSwitcher; - private Resources mRes; - private Context mContext; + private final Resources mRes; + private final Context mContext; // Whether this keyboard has voice icon on it private boolean mHasVoiceButton; // Whether voice icon is enabled at all private boolean mVoiceEnabled; - private boolean mIsAlphaKeyboard; + private final boolean mIsAlphaKeyboard; private CharSequence m123Label; private boolean mCurrentlyInSpace; private SlidingLocaleDrawable mSlidingLocaleIcon; @@ -97,7 +97,7 @@ public class LatinKeyboard extends Keyboard { private static final float OVERLAP_PERCENTAGE_LOW_PROB = 0.70f; private static final float OVERLAP_PERCENTAGE_HIGH_PROB = 0.85f; - static int sSpacebarVerticalCorrection; + private static int sSpacebarVerticalCorrection; public LatinKeyboard(Context context, int xmlLayoutResId) { this(context, xmlLayoutResId, 0); @@ -131,11 +131,6 @@ public class LatinKeyboard extends Keyboard { mSpaceKeyIndex = indexOf(' '); } - public LatinKeyboard(Context context, int layoutTemplateResId, - CharSequence characters, int columns, int horizontalPadding) { - super(context, layoutTemplateResId, characters, columns, horizontalPadding); - } - @Override protected Key createKeyFromXml(Resources res, Row parent, int x, int y, XmlResourceParser parser) { @@ -482,9 +477,8 @@ public class LatinKeyboard extends Keyboard { .equalsIgnoreCase(locale.getLanguage())) { locale = null; } - setColorOfSymbolIcons(isAutoCompletion, isBlackSym); - if (mLocale != null && mLocale.equals(locale)) return; mLocale = locale; + setColorOfSymbolIcons(isAutoCompletion, isBlackSym); } boolean isCurrentlyInSpace() { |