Refactor shift key state into KeyboardSwitcher

Change-Id: If484d3d7e7a0794ee7fc88f0771229d6f90db466

1 files changed, 6 insertions, 24 deletions

diff --git a/java/src/com/android/inputmethod/latin/ModifierKeyState.java b/java/src/com/android/inputmethod/latin/ModifierKeyState.java
index 75820e7d3..8139ec531 100644
--- a/java/src/com/android/inputmethod/latin/ModifierKeyState.java
+++ b/java/src/com/android/inputmethod/latin/ModifierKeyState.java
@@ -16,44 +16,26 @@
 
 package com.android.inputmethod.latin;
 
-class ModifierKeyState {
-    private static final int RELEASING = 0;
-    private static final int PRESSING = 1;
-    private static final int PRESSING_ON_SHIFTED = 2; // both temporary shifted & shift locked
-    private static final int MOMENTARY = 3;
-    private static final int IGNORING = 4;
+public class ModifierKeyState {
+    protected static final int RELEASING = 0;
+    protected static final int PRESSING = 1;
+    protected static final int MOMENTARY = 2;
 
-    private int mState = RELEASING;
+    protected int mState = RELEASING;
 
     public void onPress() {
         mState = PRESSING;
     }
 
-    public void onPressOnShifted() {
-        mState = PRESSING_ON_SHIFTED;
-    }
-
     public void onRelease() {
         mState = RELEASING;
     }
 
     public void onOtherKeyPressed() {
-        if (mState == PRESSING) {
-            mState = MOMENTARY;
-        } else if (mState == PRESSING_ON_SHIFTED) {
-            mState = IGNORING;
-        }
+        mState = MOMENTARY;
     }
 
     public boolean isMomentary() {
         return mState == MOMENTARY;
     }
-
-    public boolean isPressingOnShifted() {
-        return mState == PRESSING_ON_SHIFTED;
-    }
-
-    public boolean isIgnoring() {
-        return mState == IGNORING;
-    }
 }