diff options
| author | Tadashi G. Takaoka <takaoka@google.com> | 2012-01-26 18:03:30 +0900 |
|---|---|---|
| committer | Tadashi G. Takaoka <takaoka@google.com> | 2012-01-31 12:55:45 +0900 |
| commit | ca2f051cc173acc3bce384ebfe08068564bc8e07 (patch) | |
| tree | e6521ddbe372710fd703dac4574552e8b7e96e3c /java/src/com/android/inputmethod/keyboard/internal/KeyboardShiftState.java | |
| parent | 3b0f2bf169c23ea94c5a0adb275ce41b5c34ea83 (diff) | |
Auto generate various shift states alphabet keyboard automatically
If any shift state variants of alphabet keyboard layout is not
specified in KeyboardSet.Element, it will be automatically generated
from base alphabet keyboard definition.
This change also
* Eliminates KeyboardShiftState object from Keyboard.
* Removes various set shift state methods from Keyboard.
* Removes KeyboardSet.Element.elementAutoGenerate attribute.
* Separates "sticky" Key.backgroundType to "stickyOff" and "stickyOn"
* Add preserveCase flag to smiley, .com, and labeled special keys.
* Rename KeyboardShiftState class to AlphabetShiftState.
* Rename some attributes from *UppercaseLetter* to *ShiftedLetterHint*.
* Introduce shiftedLetterActivated to Key.keyLabelFlags
Change-Id: I01a0a8efeeaa76820ae728a5bdfa8d02b6ce74b7
Diffstat (limited to 'java/src/com/android/inputmethod/keyboard/internal/KeyboardShiftState.java')
| -rw-r--r-- | java/src/com/android/inputmethod/keyboard/internal/KeyboardShiftState.java | 131 |
1 files changed, 0 insertions, 131 deletions
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardShiftState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardShiftState.java deleted file mode 100644 index 4608e22a5..000000000 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardShiftState.java +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Copyright (C) 2010 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package com.android.inputmethod.keyboard.internal; - -import android.util.Log; - -public class KeyboardShiftState { - private static final String TAG = KeyboardShiftState.class.getSimpleName(); - private static final boolean DEBUG = false; - - private static final int NORMAL = 0; - private static final int MANUAL_SHIFTED = 1; - private static final int MANUAL_SHIFTED_FROM_AUTO = 2; - private static final int AUTO_SHIFTED = 3; - private static final int SHIFT_LOCKED = 4; - private static final int SHIFT_LOCK_SHIFTED = 5; - - private int mState = NORMAL; - - public void setShifted(boolean newShiftState) { - final int oldState = mState; - if (newShiftState) { - switch (oldState) { - case NORMAL: - mState = MANUAL_SHIFTED; - break; - case AUTO_SHIFTED: - mState = MANUAL_SHIFTED_FROM_AUTO; - break; - case SHIFT_LOCKED: - mState = SHIFT_LOCK_SHIFTED; - break; - } - } else { - switch (oldState) { - case MANUAL_SHIFTED: - case MANUAL_SHIFTED_FROM_AUTO: - case AUTO_SHIFTED: - mState = NORMAL; - break; - case SHIFT_LOCK_SHIFTED: - mState = SHIFT_LOCKED; - break; - } - } - if (DEBUG) - Log.d(TAG, "setShifted(" + newShiftState + "): " + toString(oldState) + " > " + this); - } - - public void setShiftLocked(boolean newShiftLockState) { - final int oldState = mState; - if (newShiftLockState) { - switch (oldState) { - case NORMAL: - case MANUAL_SHIFTED: - case MANUAL_SHIFTED_FROM_AUTO: - case AUTO_SHIFTED: - mState = SHIFT_LOCKED; - break; - } - } else { - mState = NORMAL; - } - if (DEBUG) - Log.d(TAG, "setShiftLocked(" + newShiftLockState + "): " + toString(oldState) - + " > " + this); - } - - public void setAutomaticTemporaryUpperCase() { - final int oldState = mState; - mState = AUTO_SHIFTED; - if (DEBUG) - Log.d(TAG, "setAutomaticTemporaryUpperCase: " + toString(oldState) + " > " + this); - } - - public boolean isShiftedOrShiftLocked() { - return mState != NORMAL; - } - - public boolean isShiftLocked() { - return mState == SHIFT_LOCKED || mState == SHIFT_LOCK_SHIFTED; - } - - public boolean isShiftLockShifted() { - return mState == SHIFT_LOCK_SHIFTED; - } - - public boolean isAutomaticTemporaryUpperCase() { - return mState == AUTO_SHIFTED; - } - - public boolean isManualTemporaryUpperCase() { - return mState == MANUAL_SHIFTED || mState == MANUAL_SHIFTED_FROM_AUTO - || mState == SHIFT_LOCK_SHIFTED; - } - - public boolean isManualTemporaryUpperCaseFromAuto() { - return mState == MANUAL_SHIFTED_FROM_AUTO; - } - - @Override - public String toString() { - return toString(mState); - } - - private static String toString(int state) { - switch (state) { - case NORMAL: return "NORMAL"; - case MANUAL_SHIFTED: return "MANUAL_SHIFTED"; - case MANUAL_SHIFTED_FROM_AUTO: return "MANUAL_SHIFTED_FROM_AUTO"; - case AUTO_SHIFTED: return "AUTO_SHIFTED"; - case SHIFT_LOCKED: return "SHIFT_LOCKED"; - case SHIFT_LOCK_SHIFTED: return "SHIFT_LOCK_SHIFTED"; - default: return "UKNOWN"; - } - } -} |
