From 83d81f2e34b28e56bb0f8505d2315ae53c8f9eef Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Tue, 24 Jan 2012 15:02:35 +0900 Subject: Fix sliding shift input in caps lock mode Bug: 5881820 Change-Id: I4cbe3eda83c09edc9da8efbdff7d3359c1e140d5 --- .../com/android/inputmethod/keyboard/internal/KeyboardState.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'java/src') diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java index f89f156ea..5054bd954 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java @@ -383,12 +383,16 @@ public class KeyboardState { if (mIsAlphabetMode) { final boolean isShiftLocked = mAlphabetShiftState.isShiftLocked(); if (mShiftKeyState.isMomentary()) { - // After chording input while normal state. if (mAlphabetShiftState.isShiftLockShifted()) { + // After chording input while caps lock state. setShiftLocked(true); } else { + // After chording input while normal state. setShifted(UNSHIFT); } + } else if (mAlphabetShiftState.isShiftLockShifted() && withSliding) { + // In caps lock state, shift has been pressed and slid out to other key. + setShiftLocked(true); } else if (isShiftLocked && !mAlphabetShiftState.isShiftLockShifted() && (mShiftKeyState.isPressing() || mShiftKeyState.isPressingOnShifted()) && !withSliding) { -- cgit v1.2.3-83-g751a