Removed shiftCodeAlways

3 files changed, 2 insertions, 11 deletions

diff --git a/ime/app/src/main/java/com/anysoftkeyboard/keyboards/AnyKeyboard.java b/ime/app/src/main/java/com/anysoftkeyboard/keyboards/AnyKeyboard.java
index 5b7e7813c..171a6929c 100644
--- a/ime/app/src/main/java/com/anysoftkeyboard/keyboards/AnyKeyboard.java
+++ b/ime/app/src/main/java/com/anysoftkeyboard/keyboards/AnyKeyboard.java
@@ -830,11 +830,6 @@ public abstract class AnyKeyboard extends Keyboard {
                 }
             }
 
-            // if the shift-character is a symbol, we only show it if the SHIFT is pressed,
-            // not if the shift is active.
-            // Note: above doesn't work, it only shows the symbols if SHIFT is being held.
-            mShiftCodesAlways = true;
-
             if (popupCharacters != null && popupCharacters.length() == 0) {
                 // If there is a keyboard with no keys specified in
                 // popupCharacters
@@ -842,10 +837,6 @@ public abstract class AnyKeyboard extends Keyboard {
             }
         }
 
-        public boolean isShiftCodesAlways() {
-            return mShiftCodesAlways;
-        }
-
         @Override
         public int getCodeAtIndex(int index, boolean isShifted) {
             return mCodes.length == 0 ? 0 : isShifted ? mShiftedCodes[index] : mCodes[index];
diff --git a/ime/app/src/main/java/com/anysoftkeyboard/keyboards/views/AnyKeyboardViewBase.java b/ime/app/src/main/java/com/anysoftkeyboard/keyboards/views/AnyKeyboardViewBase.java
index f6480555a..7e9d5420c 100644
--- a/ime/app/src/main/java/com/anysoftkeyboard/keyboards/views/AnyKeyboardViewBase.java
+++ b/ime/app/src/main/java/com/anysoftkeyboard/keyboards/views/AnyKeyboardViewBase.java
@@ -1163,7 +1163,7 @@ public class AnyKeyboardViewBase extends View implements InputViewBinder, Pointe
                                                         mKeyDetector.isKeyShifted(key))));
             }
             // remembering for next time
-            if (key.isShiftCodesAlways()) key.shiftedKeyLabel = label;
+            key.shiftedKeyLabel = label;
         }
         return label;
     }
diff --git a/ime/app/src/main/java/com/anysoftkeyboard/keyboards/views/KeyDetector.java b/ime/app/src/main/java/com/anysoftkeyboard/keyboards/views/KeyDetector.java
index 98b3cb5f0..27f2605b5 100644
--- a/ime/app/src/main/java/com/anysoftkeyboard/keyboards/views/KeyDetector.java
+++ b/ime/app/src/main/java/com/anysoftkeyboard/keyboards/views/KeyDetector.java
@@ -116,6 +116,6 @@ public abstract class KeyDetector {
         AnyKeyboard.AnyKey anyKey = (AnyKeyboard.AnyKey) key;
         return mKeyboard.keyboardSupportShift()
                 && ((mShiftKey != null && mShiftKey.pressed)
-                        || (anyKey.isShiftCodesAlways() && mKeyboard.isShifted()));
+                        || mKeyboard.isShifted()));
     }
 }