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

Disable sliding language switch on phone and number layout

Browse source 
Bug: 4331621
Change-Id: Id02c64bb2724a5f990d6dcc548a8d98a1034d531
This commit is contained in:
Tadashi G. Takaoka 2011-04-25 19:27:16 +09:00
parent 9d4aadbe24
commit 4c82225ad6
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
java/src/com/android/inputmethod/keyboard/LatinKeyboard.java
View file

@ -294,9 +294,12 @@ public class LatinKeyboard extends Keyboard {
paint.setColor(getSpacebarTextColor(mSpacebarTextColor, textFadeFactor)); paint.setColor(getSpacebarTextColor(mSpacebarTextColor, textFadeFactor));
canvas.drawText(language, width / 2, baseline - descent, paint); canvas.drawText(language, width / 2, baseline - descent, paint);
// Put arrows that are already layed out on either side of the text // Put arrows that are already laid out on either side of the text
// Because language switch is disabled on phone and number layouts, hide arrows.
// TODO: Sort out how to enable language switch on these layouts.
if (mSubtypeSwitcher.useSpacebarLanguageSwitcher() if (mSubtypeSwitcher.useSpacebarLanguageSwitcher()
&& mSubtypeSwitcher.getEnabledKeyboardLocaleCount() > 1) { && mSubtypeSwitcher.getEnabledKeyboardLocaleCount() > 1
&& !(isPhoneKeyboard() || isNumberKeyboard())) {
mButtonArrowLeftIcon.setColorFilter(getSpacebarDrawableFilter(textFadeFactor)); mButtonArrowLeftIcon.setColorFilter(getSpacebarDrawableFilter(textFadeFactor));
mButtonArrowRightIcon.setColorFilter(getSpacebarDrawableFilter(textFadeFactor)); mButtonArrowRightIcon.setColorFilter(getSpacebarDrawableFilter(textFadeFactor));
mButtonArrowLeftIcon.draw(canvas); mButtonArrowLeftIcon.draw(canvas);
@ -349,6 +352,10 @@ public class LatinKeyboard extends Keyboard {
} }
public boolean shouldTriggerSpacebarSlidingLanguageSwitch(int diff) { public boolean shouldTriggerSpacebarSlidingLanguageSwitch(int diff) {
// On phone and number layouts, sliding language switch is disabled.
// TODO: Sort out how to enable language switch on these layouts.
if (isPhoneKeyboard() || isNumberKeyboard())
return false;
return Math.abs(diff) > mSpacebarLanguageSwitchThreshold; return Math.abs(diff) > mSpacebarLanguageSwitchThreshold;
} }