Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 183570bb authored by Satoshi Kataoka's avatar Satoshi Kataoka Committed by Android Git Automerger
Browse files

am e3150664: Revert "Remove symbols shifted layout related code" 

* commit 'e3150664':
  Revert "Remove symbols shifted layout related code"
parents 2ff67d34 e3150664

java/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -388,6 +388,7 @@ 
            <enum name="alphabetShiftLocked" value="3" />

            <enum name="alphabetShiftLockShifted" value="4" />

            <enum name="symbols" value="5" />

            <enum name="symbolsShifted" value="6"  />

            <enum name="phone" value="7"  />

            <enum name="phoneSymbols" value="8"  />

            <enum name="number" value="9"  />
@@ -449,6 +450,7 @@ 
            <enum name="alphabetShiftLocked" value="3" />

            <enum name="alphabetShiftLockShifted" value="4" />

            <enum name="symbols" value="5" />

            <enum name="symbolsShifted" value="6"  />

            <enum name="phone" value="7"  />

            <enum name="phoneSymbols" value="8"  />

            <enum name="number" value="9"  />

java/src/com/android/inputmethod/accessibility/AccessibleKeyboardViewProxy.java

+2 −0
Original line number Diff line number Diff line
@@ -357,6 +357,7 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp 
            break;

        case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED:

        case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED:

        case KeyboardId.ELEMENT_SYMBOLS_SHIFTED:

            text = context.getText(R.string.spoken_description_shiftmode_on);

            break;

        default:
@@ -388,6 +389,7 @@ public final class AccessibleKeyboardViewProxy extends AccessibilityDelegateComp 
            resId = R.string.spoken_description_mode_alpha;

            break;

        case KeyboardId.ELEMENT_SYMBOLS:

        case KeyboardId.ELEMENT_SYMBOLS_SHIFTED:

            resId = R.string.spoken_description_mode_symbol;

            break;

        case KeyboardId.ELEMENT_PHONE:

java/src/com/android/inputmethod/accessibility/KeyCodeDescriptionMapper.java

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ public final class KeyCodeDescriptionMapper { 
            resId = R.string.spoken_description_to_symbol;

            break;

        case KeyboardId.ELEMENT_SYMBOLS:

        case KeyboardId.ELEMENT_SYMBOLS_SHIFTED:

            resId = R.string.spoken_description_to_alpha;

            break;

        case KeyboardId.ELEMENT_PHONE:
@@ -190,6 +191,7 @@ public final class KeyCodeDescriptionMapper { 
            break;

        case KeyboardId.ELEMENT_ALPHABET_AUTOMATIC_SHIFTED:

        case KeyboardId.ELEMENT_ALPHABET_MANUAL_SHIFTED:

        case KeyboardId.ELEMENT_SYMBOLS_SHIFTED:

            resId = R.string.spoken_description_shift_shifted;

            break;

        default:

java/src/com/android/inputmethod/keyboard/KeyboardId.java

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ public final class KeyboardId { 
    public static final int ELEMENT_ALPHABET_SHIFT_LOCKED = 3;

    public static final int ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED = 4;

    public static final int ELEMENT_SYMBOLS = 5;

    public static final int ELEMENT_SYMBOLS_SHIFTED = 6;

    public static final int ELEMENT_PHONE = 7;

    public static final int ELEMENT_PHONE_SYMBOLS = 8;

    public static final int ELEMENT_NUMBER = 9;
@@ -219,6 +220,7 @@ public final class KeyboardId { 
        case ELEMENT_ALPHABET_SHIFT_LOCKED: return "alphabetShiftLocked";

        case ELEMENT_ALPHABET_SHIFT_LOCK_SHIFTED: return "alphabetShiftLockShifted";

        case ELEMENT_SYMBOLS: return "symbols";

        case ELEMENT_SYMBOLS_SHIFTED: return "symbolsShifted";

        case ELEMENT_PHONE: return "phone";

        case ELEMENT_PHONE_SYMBOLS: return "phoneSymbols";

        case ELEMENT_NUMBER: return "number";

java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java

+6 −0
Original line number Diff line number Diff line
@@ -269,6 +269,12 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions { 
        mEmojiKeyboardView.setVisibility(View.VISIBLE);

    }



    // Implements {@link KeyboardState.SwitchActions}.

    @Override

    public void setSymbolsShiftedKeyboard() {

        setKeyboard(mKeyboardLayoutSet.getKeyboard(KeyboardId.ELEMENT_SYMBOLS_SHIFTED));

    }



    // Implements {@link KeyboardState.SwitchActions}.

    @Override

    public void requestUpdatingShiftState() {