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

Commit b5b92f9b authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka
Browse files

Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard 

This is the first step to support separate Keyboard for elementName.

Change-Id: Icef66564b6938910fa06ecab664dce4be84c9505
parent 25971b5a

java/res/values/attrs.xml

+14 −13
Original line number Diff line number Diff line
@@ -346,19 +346,20 @@ 
        <!-- This should be aligned with KeyboardId.ELEMENT_* -->

        <attr name="elementName" format="enum">

            <enum name="alphabet" value="0" />

          <!--  TODO: Implement alphabet variant shift keyboards

          <enum name="alphabetManualTemporaryShift" value="1" />

          <enum name="alphabetAutomaticTemporaryShift" value="2" />

          <enum name="alphabetShiftLock" value="3" />

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

          -->

            <enum name="alphabetManualShifted" value="1" />

            <enum name="alphabetAutomaticShifted" value="2" />

            <enum name="alphabetShiftLocked" value="3" />

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

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

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

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

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

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

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

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

        </attr>

        <attr name="elementKeyboard" format="reference" />

        <attr name="elementKeyboard" format="reference|enum">

            <!-- This should be aligned with KeyboardSet.ELEMENT_KEYBOARD_* -->

            <enum name="autoGenerateFromAlphabet" value="1"/>

        </attr>

        <!-- TODO: Add setShifted and setShiftLocked attribute. -->

    </declare-styleable>

</resources>

java/res/xml-ar/keyboard_set.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ 
        latin:elementName="symbols"

        latin:elementKeyboard="@xml/kbd_symbols" />

    <Element

        latin:elementName="symbolsShift"

        latin:elementName="symbolsShifted"

        latin:elementKeyboard="@xml/kbd_symbols_shift" />

    <Element

        latin:elementName="phone"

        latin:elementKeyboard="@xml/kbd_phone" />

    <Element

        latin:elementName="phoneShift"

        latin:elementName="phoneShifted"

        latin:elementKeyboard="@xml/kbd_phone_shift" />

    <Element

        latin:elementName="number"

java/res/xml-be/keyboard_set.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ 
        latin:elementName="symbols"

        latin:elementKeyboard="@xml/kbd_symbols" />

    <Element

        latin:elementName="symbolsShift"

        latin:elementName="symbolsShifted"

        latin:elementKeyboard="@xml/kbd_symbols_shift" />

    <Element

        latin:elementName="phone"

        latin:elementKeyboard="@xml/kbd_phone" />

    <Element

        latin:elementName="phoneShift"

        latin:elementName="phoneShifted"

        latin:elementKeyboard="@xml/kbd_phone_shift" />

    <Element

        latin:elementName="number"

java/res/xml-bg/keyboard_set.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ 
        latin:elementName="symbols"

        latin:elementKeyboard="@xml/kbd_symbols" />

    <Element

        latin:elementName="symbolsShift"

        latin:elementName="symbolsShifted"

        latin:elementKeyboard="@xml/kbd_symbols_shift" />

    <Element

        latin:elementName="phone"

        latin:elementKeyboard="@xml/kbd_phone" />

    <Element

        latin:elementName="phoneShift"

        latin:elementName="phoneShifted"

        latin:elementKeyboard="@xml/kbd_phone_shift" />

    <Element

        latin:elementName="number"

java/res/xml-cs/keyboard_set.xml

+2 −2
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ 
        latin:elementName="symbols"

        latin:elementKeyboard="@xml/kbd_symbols" />

    <Element

        latin:elementName="symbolsShift"

        latin:elementName="symbolsShifted"

        latin:elementKeyboard="@xml/kbd_symbols_shift" />

    <Element

        latin:elementName="phone"

        latin:elementKeyboard="@xml/kbd_phone" />

    <Element

        latin:elementName="phoneShift"

        latin:elementName="phoneShifted"

        latin:elementKeyboard="@xml/kbd_phone_shift" />

    <Element

        latin:elementName="number"