Skip to content
Snippets Groups Projects
Commit 34f18203 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Remove KeyboardSwitcher.updateShiftLockState method

Change-Id: I032fc50a62a573ba4258530e695c8c88467783c6
parent dc52e7c6
No related branches found
No related tags found
No related merge requests found
......@@ -168,7 +168,6 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
final Keyboard oldKeyboard = mKeyboardView.getKeyboard();
mKeyboardView.setKeyboard(keyboard);
mCurrentInputView.setKeyboardGeometry(keyboard.mTopPadding);
updateShiftLockState(keyboard);
mKeyboardView.setKeyPreviewPopupEnabled(
SettingsValues.isKeyPreviewPopupEnabled(mPrefs, mResources),
SettingsValues.getKeyPreviewPopupDismissDelay(mPrefs, mResources));
......@@ -178,19 +177,6 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
updateShiftState();
}
private void updateShiftLockState(Keyboard keyboard) {
if (keyboard.mId.equals(mSymbolsShiftedKeyboardId)) {
// Symbol keyboard may have an ALT key that has a caps lock style indicator (a.k.a.
// sticky shift key). To show or dismiss the indicator, we need to call setShiftLocked()
// that takes care of the current keyboard having such ALT key or not.
keyboard.setShiftLocked(keyboard.hasShiftLockKey());
} else if (keyboard.mId.equals(mSymbolsKeyboardId)) {
// Symbol keyboard has an ALT key that has a caps lock style indicator. To disable the
// indicator, we need to call setShiftLocked(false).
keyboard.setShiftLocked(false);
}
}
private LatinKeyboard getKeyboard(KeyboardId id) {
final SoftReference<LatinKeyboard> ref = mKeyboardCache.get(id);
LatinKeyboard keyboard = (ref == null) ? null : ref.get();
......@@ -419,7 +405,13 @@ public class KeyboardSwitcher implements KeyboardState.SwitchActions,
// Implements {@link KeyboardState.SwitchActions}.
@Override
public void setSymbolsShiftedKeyboard() {
setKeyboard(getKeyboard(mSymbolsShiftedKeyboardId));
final Keyboard keyboard = getKeyboard(mSymbolsShiftedKeyboardId);
setKeyboard(keyboard);
// TODO: Remove this logic once we introduce initial keyboard shift state attribute.
// Symbol shift keyboard may have a shift key that has a caps lock style indicator (a.k.a.
// sticky shift key). To show or dismiss the indicator, we need to call setShiftLocked()
// that takes care of the current keyboard having such shift key or not.
keyboard.setShiftLocked(keyboard.hasShiftLockKey());
}
public boolean isInMomentarySwitchState() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment