nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am c01d978f: am a104575c: Merge "Draw language label on space key of symbol+alt mode" into gingerbread 

Merge commit 'c01d978f56f90425f070d57a66968aa77ef69a7d'

* commit 'c01d978f56f90425f070d57a66968aa77ef69a7d':
  Draw language label on space key of symbol+alt mode
main
Tadashi G. Takaoka 2010-09-21 10:44:29 -07:00 committed by Android Git Automerger
parent 75abaf5d8f c01d978f56
commit 41acad294c
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
java/src/com/android/inputmethod/latin/LatinKeyboard.java
View File

@ -56,8 +56,8 @@ public class LatinKeyboard extends Keyboard {
private Drawable mMicPreviewIcon; private Drawable mMicPreviewIcon;
private Drawable m123MicIcon; private Drawable m123MicIcon;
private Drawable m123MicPreviewIcon; private Drawable m123MicPreviewIcon;
private Drawable mButtonArrowLeftIcon; private final Drawable mButtonArrowLeftIcon;
private Drawable mButtonArrowRightIcon; private final Drawable mButtonArrowRightIcon;
private Key mShiftKey; private Key mShiftKey;
private Key mEnterKey; private Key mEnterKey;
private Key mF1Key; private Key mF1Key;
@ -66,15 +66,15 @@ public class LatinKeyboard extends Keyboard {
private int mSpaceKeyIndex = -1; private int mSpaceKeyIndex = -1;
private int mSpaceDragStartX; private int mSpaceDragStartX;
private int mSpaceDragLastDiff; private int mSpaceDragLastDiff;
/* package */ Locale mLocale; private Locale mLocale;
private LanguageSwitcher mLanguageSwitcher; private LanguageSwitcher mLanguageSwitcher;
private Resources mRes; private final Resources mRes;
private Context mContext; private final Context mContext;
// Whether this keyboard has voice icon on it // Whether this keyboard has voice icon on it
private boolean mHasVoiceButton; private boolean mHasVoiceButton;
// Whether voice icon is enabled at all // Whether voice icon is enabled at all
private boolean mVoiceEnabled; private boolean mVoiceEnabled;
private boolean mIsAlphaKeyboard; private final boolean mIsAlphaKeyboard;
private CharSequence m123Label; private CharSequence m123Label;
private boolean mCurrentlyInSpace; private boolean mCurrentlyInSpace;
private SlidingLocaleDrawable mSlidingLocaleIcon; 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_LOW_PROB = 0.70f;
private static final float OVERLAP_PERCENTAGE_HIGH_PROB = 0.85f; private static final float OVERLAP_PERCENTAGE_HIGH_PROB = 0.85f;
static int sSpacebarVerticalCorrection; private static int sSpacebarVerticalCorrection;
public LatinKeyboard(Context context, int xmlLayoutResId) { public LatinKeyboard(Context context, int xmlLayoutResId) {
this(context, xmlLayoutResId, 0); this(context, xmlLayoutResId, 0);
@ -131,11 +131,6 @@ public class LatinKeyboard extends Keyboard {
mSpaceKeyIndex = indexOf(' '); mSpaceKeyIndex = indexOf(' ');
} }
public LatinKeyboard(Context context, int layoutTemplateResId,
CharSequence characters, int columns, int horizontalPadding) {
super(context, layoutTemplateResId, characters, columns, horizontalPadding);
}
@Override @Override
protected Key createKeyFromXml(Resources res, Row parent, int x, int y, protected Key createKeyFromXml(Resources res, Row parent, int x, int y,
XmlResourceParser parser) { XmlResourceParser parser) {
@ -482,9 +477,8 @@ public class LatinKeyboard extends Keyboard {
.equalsIgnoreCase(locale.getLanguage())) { .equalsIgnoreCase(locale.getLanguage())) {
locale = null; locale = null;
} }
setColorOfSymbolIcons(isAutoCompletion, isBlackSym);
if (mLocale != null && mLocale.equals(locale)) return;
mLocale = locale; mLocale = locale;
setColorOfSymbolIcons(isAutoCompletion, isBlackSym);
} }
boolean isCurrentlyInSpace() { boolean isCurrentlyInSpace() {