2 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index 4322997e8..438680cf8 100644
--- a/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -147,8 +147,7 @@ public class KeyboardSwitcher {
         public boolean equals(KeyboardId other) {
           return other.mXml == this.mXml
               && other.mKeyboardMode == this.mKeyboardMode
-              && other.mEnableShiftLock == this.mEnableShiftLock
-              && other.mHasVoice == this.mHasVoice;
+              && other.mEnableShiftLock == this.mEnableShiftLock;
         }
 
         public int hashCode() {
diff --git a/src/com/android/inputmethod/latin/LatinIME.java b/src/com/android/inputmethod/latin/LatinIME.java
index 4c81b33b1..18b277c5a 100644
--- a/src/com/android/inputmethod/latin/LatinIME.java
+++ b/src/com/android/inputmethod/latin/LatinIME.java
@@ -534,6 +534,7 @@ public class LatinIME extends InputMethodService
         mDeleteCount = 0;
         mJustAddedAutoSpace = false;
         loadSettings();
+        updateShiftKeyState(attribute);
 
         setCandidatesViewShown(false);
         setSuggestions(null, false, false, false);