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

Commit af4efd5a authored by Tadashi Takaoka's avatar Tadashi Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Revert "Add autoGenerateFromAlphabet enum to KeyboardSet.Element.elementKeyboard""

parents a34f66de 8bb20bc6

java/res/values/attrs.xml

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

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

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

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

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

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

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

          <!--  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="symbols" value="5" />

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

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

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

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

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

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

        </attr>

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

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

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

        </attr>

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

        <!-- 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="symbolsShifted"

        latin:elementName="symbolsShift"

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

    <Element

        latin:elementName="phone"

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

    <Element

        latin:elementName="phoneShifted"

        latin:elementName="phoneShift"

        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="symbolsShifted"

        latin:elementName="symbolsShift"

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

    <Element

        latin:elementName="phone"

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

    <Element

        latin:elementName="phoneShifted"

        latin:elementName="phoneShift"

        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="symbolsShifted"

        latin:elementName="symbolsShift"

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

    <Element

        latin:elementName="phone"

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

    <Element

        latin:elementName="phoneShifted"

        latin:elementName="phoneShift"

        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="symbolsShifted"

        latin:elementName="symbolsShift"

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

    <Element

        latin:elementName="phone"

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

    <Element

        latin:elementName="phoneShifted"

        latin:elementName="phoneShift"

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

    <Element

        latin:elementName="number"