Move KeyboardShiftState to KeyboardState

Bug: 5708602
Change-Id: Idfe69978972bb674e0f360ef5e324739e2652d25

1 files changed, 43 insertions, 1 deletions

diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
index b6e4f2daa..fd7e77863 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardState.java
@@ -18,6 +18,8 @@ package com.android.inputmethod.keyboard.internal;
 
 // TODO: Add unit tests
 public class KeyboardState {
+    private KeyboardShiftState mKeyboardShiftState = new KeyboardShiftState();
+
     // TODO: Combine these key state objects with auto mode switch state.
     private ShiftKeyState mShiftKeyState = new ShiftKeyState("Shift");
     private ModifierKeyState mSymbolKeyState = new ModifierKeyState("Symbol");
@@ -25,6 +27,45 @@ public class KeyboardState {
     public KeyboardState() {
     }
 
+    public boolean isShiftLocked() {
+        return mKeyboardShiftState.isShiftLocked();
+    }
+
+    public boolean isShiftLockShifted() {
+        return mKeyboardShiftState.isShiftLockShifted();
+    }
+
+    public boolean isShiftedOrShiftLocked() {
+        return mKeyboardShiftState.isShiftedOrShiftLocked();
+    }
+
+    public boolean isAutomaticTemporaryUpperCase() {
+        return mKeyboardShiftState.isAutomaticTemporaryUpperCase();
+    }
+
+    public boolean isManualTemporaryUpperCase() {
+        return mKeyboardShiftState.isManualTemporaryUpperCase();
+    }
+
+    public boolean isManualTemporaryUpperCaseFromAuto() {
+        return mKeyboardShiftState.isManualTemporaryUpperCaseFromAuto();
+    }
+
+    // TODO: Get rid of this method
+    public void setShifted(boolean shifted) {
+        mKeyboardShiftState.setShifted(shifted);
+    }
+
+    // TODO: Get rid of this method
+    public void setShiftLocked(boolean shiftLocked) {
+        mKeyboardShiftState.setShiftLocked(shiftLocked);
+    }
+
+    // TODO: Get rid of this method
+    public void setAutomaticTemporaryUpperCase() {
+        mKeyboardShiftState.setAutomaticTemporaryUpperCase();
+    }
+
     // TODO: Get rid of this method
     public boolean isShiftKeyIgnoring() {
         return mShiftKeyState.isIgnoring();
@@ -107,7 +148,8 @@ public class KeyboardState {
 
     @Override
     public String toString() {
-        return "[shift=" + mShiftKeyState
+        return "[keyboard=" + mKeyboardShiftState
+                + " shift=" + mShiftKeyState
                 + " symbol=" + mSymbolKeyState + "]";
     }
 }