Skip to content

Commit a53ff30

Browse files
authored
remove the momentary alpha shift state to allow auto-caps to work after sliding from shift (#241)
1 parent 404ff3e commit a53ff30

File tree

1 file changed

+0
-11
lines changed

1 file changed

+0
-11
lines changed

app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/internal/KeyboardState.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@ public interface SwitchActions {
7777
private static final int SWITCH_STATE_SYMBOL = 2;
7878
private static final int SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL = 3;
7979
private static final int SWITCH_STATE_MOMENTARY_SYMBOL_AND_MORE = 4;
80-
private static final int SWITCH_STATE_MOMENTARY_ALPHA_SHIFT = 5;
8180
private int mSwitchState = SWITCH_STATE_ALPHA;
8281

8382
private boolean mIsAlphabetMode;
@@ -534,12 +533,6 @@ private void onReleaseShift(final boolean withSliding, final int autoCapsFlags,
534533
mShiftKeyState.onRelease();
535534
mSwitchActions.requestUpdatingShiftState(autoCapsFlags, recapitalizeMode);
536535
return;
537-
} else if (mAlphabetShiftState.isShiftLockShifted() && withSliding) {
538-
// In shift locked state, shift has been pressed and slid out to other key.
539-
setShiftLocked(true);
540-
} else if (mAlphabetShiftState.isManualShifted() && withSliding) {
541-
// Shift has been pressed and slid out to other key.
542-
mSwitchState = SWITCH_STATE_MOMENTARY_ALPHA_SHIFT;
543536
} else if (isShiftLocked && !mAlphabetShiftState.isShiftLockShifted()
544537
&& (mShiftKeyState.isPressing() || mShiftKeyState.isPressingOnShifted())
545538
&& !withSliding) {
@@ -581,9 +574,6 @@ public void onFinishSlidingInput(final int autoCapsFlags, final int recapitalize
581574
case SWITCH_STATE_MOMENTARY_SYMBOL_AND_MORE:
582575
toggleShiftInSymbols();
583576
break;
584-
case SWITCH_STATE_MOMENTARY_ALPHA_SHIFT:
585-
setAlphabetKeyboard(autoCapsFlags, recapitalizeMode);
586-
break;
587577
}
588578
}
589579

@@ -654,7 +644,6 @@ private static String switchStateToString(final int switchState) {
654644
case SWITCH_STATE_SYMBOL: return "SYMBOL";
655645
case SWITCH_STATE_MOMENTARY_ALPHA_AND_SYMBOL: return "MOMENTARY-ALPHA-SYMBOL";
656646
case SWITCH_STATE_MOMENTARY_SYMBOL_AND_MORE: return "MOMENTARY-SYMBOL-MORE";
657-
case SWITCH_STATE_MOMENTARY_ALPHA_SHIFT: return "MOMENTARY-ALPHA_SHIFT";
658647
default: return null;
659648
}
660649
}

0 commit comments

Comments
 (0)