Merge "Move some inner static class to top class in new package"

1 files changed, 0 insertions, 89 deletions

diff --git a/java/src/com/android/inputmethod/latin/LatinKeyboardShiftState.java b/java/src/com/android/inputmethod/latin/LatinKeyboardShiftState.java
deleted file mode 100644
index e916306c8..000000000
--- a/java/src/com/android/inputmethod/latin/LatinKeyboardShiftState.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.android.inputmethod.latin;
-
-import android.util.Log;
-
-public class LatinKeyboardShiftState {
-    private static final String TAG = "LatinKeyboardShiftState";
-    private static final boolean DEBUG = KeyboardSwitcher.DEBUG_STATE;
-
-    private static final int NORMAL = 0;
-    private static final int MANUAL_SHIFTED = 1;
-    private static final int SHIFT_LOCKED = 2;
-    private static final int AUTO_SHIFTED = 3;
-    private static final int SHIFT_LOCK_SHIFTED = 4;
-
-    private int mState = NORMAL;
-
-    public boolean setShifted(boolean newShiftState) {
-        final int oldState = mState;
-        if (newShiftState) {
-            if (oldState == NORMAL || oldState == AUTO_SHIFTED) {
-                mState = MANUAL_SHIFTED;
-            } else if (oldState == SHIFT_LOCKED) {
-                mState = SHIFT_LOCK_SHIFTED;
-            }
-        } else {
-            if (oldState == MANUAL_SHIFTED || oldState == AUTO_SHIFTED) {
-                mState = NORMAL;
-            } else if (oldState == SHIFT_LOCK_SHIFTED) {
-                mState = SHIFT_LOCKED;
-                            }
-        }
-        if (DEBUG)
-            Log.d(TAG, "setShifted(" + newShiftState + "): " + toString(oldState) + " > " + this);
-        return mState != oldState;
-    }
-
-    public void setShiftLocked(boolean newShiftLockState) {
-        final int oldState = mState;
-        if (newShiftLockState) {
-            if (oldState == NORMAL || oldState == MANUAL_SHIFTED || oldState == AUTO_SHIFTED)
-                mState = SHIFT_LOCKED;
-        } else {
-            if (oldState == SHIFT_LOCKED || oldState == SHIFT_LOCK_SHIFTED)
-                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 isAutomaticTemporaryUpperCase() {
-        return mState == AUTO_SHIFTED;
-    }
-
-    public boolean isManualTemporaryUpperCase() {
-        return mState == MANUAL_SHIFTED || mState == SHIFT_LOCK_SHIFTED;
-    }
-
-    @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 SHIFT_LOCKED: return "SHIFT_LOCKED";
-        case AUTO_SHIFTED: return "AUTO_SHIFTED";
-        case SHIFT_LOCK_SHIFTED: return "SHIFT_LOCK_SHIFTED";
-        default: return "UKNOWN";
-        }
-    }
-}
\ No newline at end of file