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

am 07145a37: Fix automatic temporary upper case mode shift key graphics 

* commit '07145a3706d7692806b9c53548795fa2dbf8f4f0':
  Fix automatic temporary upper case mode shift key graphics
main
Tadashi G. Takaoka 2011-12-26 06:44:34 -08:00 committed by Android Git Automerger
parent 07105e667c 07145a3706
commit 33f4ea7ee6
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
java/src/com/android/inputmethod/keyboard/Keyboard.java
View File

@ -205,16 +205,21 @@ public class Keyboard {
return mShiftState.isShiftLocked(); return mShiftState.isShiftLocked();
} }
private void setShiftKeyGraphics(boolean newShiftState) {
if (mShiftState.isShiftLocked()) {
return;
}
for (final Key key : mShiftKeys) {
final int attrId = newShiftState
? R.styleable.Keyboard_iconShiftKeyShifted
: R.styleable.Keyboard_iconShiftKey;
key.setIcon(mIconsSet.getIconByAttrId(attrId));
}
}
// TODO: Remove this method. // TODO: Remove this method.
void setShifted(boolean newShiftState) { void setShifted(boolean newShiftState) {
if (!mShiftState.isShiftLocked()) { setShiftKeyGraphics(newShiftState);
for (final Key key : mShiftKeys) {
final int attrId = newShiftState
? R.styleable.Keyboard_iconShiftKeyShifted
: R.styleable.Keyboard_iconShiftKey;
key.setIcon(mIconsSet.getIconByAttrId(attrId));
}
}
mShiftState.setShifted(newShiftState); mShiftState.setShifted(newShiftState);
} }
@ -225,6 +230,7 @@ public class Keyboard {
// TODO: Remove this method // TODO: Remove this method
void setAutomaticTemporaryUpperCase() { void setAutomaticTemporaryUpperCase() {
setShiftKeyGraphics(true);
mShiftState.setAutomaticTemporaryUpperCase(); mShiftState.setAutomaticTemporaryUpperCase();
} }

2
java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
View File

@ -134,6 +134,7 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
if (mainKeyboardId.isPhoneKeyboard()) { if (mainKeyboardId.isPhoneKeyboard()) {
mState.onToggleAlphabetAndSymbols(); mState.onToggleAlphabetAndSymbols();
} }
updateShiftState();
} }
public void saveKeyboardState() { public void saveKeyboardState() {
@ -164,7 +165,6 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
mKeyboardView.updateSpacebar(0.0f, mKeyboardView.updateSpacebar(0.0f,
mSubtypeSwitcher.needsToDisplayLanguage(keyboard.mId.mLocale)); mSubtypeSwitcher.needsToDisplayLanguage(keyboard.mId.mLocale));
mKeyboardView.updateShortcutKey(mSubtypeSwitcher.isShortcutImeReady()); mKeyboardView.updateShortcutKey(mSubtypeSwitcher.isShortcutImeReady());
updateShiftState();
final boolean localeChanged = (oldKeyboard == null) final boolean localeChanged = (oldKeyboard == null)
|| !keyboard.mId.mLocale.equals(oldKeyboard.mId.mLocale); || !keyboard.mId.mLocale.equals(oldKeyboard.mId.mLocale);
mInputMethodService.mHandler.startDisplayLanguageOnSpacebar(localeChanged); mInputMethodService.mHandler.startDisplayLanguageOnSpacebar(localeChanged);