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

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

Move long press shift handling from PointerTracker to KeyboardState 

This change also
  * Rename phone shift keyboard to phone symbols keyboard.
    Use CODE_SWITCH_ALPHA_SYMBOL code to switch between phone and phone symbols keyboard.
  * Remove phone symbols keyboard from tablet.
  * Introduces enableLongPress flag of Key.keyActionFlags attribute.
  * Remove clumsy long press code from PointerTracker.
  * Remove CODE_CAPSLOCK handling from LatinIME.
  * Make KeyboardSwitcher to invoke haptic and audio feedback.

Change-Id: I00e1f697a10ab5112aec75e36853b96246ff5054
parent 3feb99fa

java/res/values/attrs.xml

+3 −2
Original line number Diff line number Diff line
@@ -249,6 +249,7 @@ 
            <flag name="isRepeatable" value="0x01" />

            <flag name="noKeyPreview" value="0x02" />

            <flag name="altCodeWhileTyping" value="0x04" />

            <flag name="enableLongPress" value="0x08" />

        </attr>

        <!-- The string of characters to output when this key is pressed. -->

        <attr name="keyOutputText" format="string" />
@@ -341,7 +342,7 @@ 
            <enum name="symbols" value="5" />

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

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

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

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

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

        </attr>

        <!-- This should be aligned with KeyboardId.MODE_* -->
@@ -403,7 +404,7 @@ 
            <enum name="symbols" value="5" />

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

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

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

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

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

        </attr>

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

java/res/values/keycodes.xml

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
    <integer name="key_space">32</integer>

    <integer name="key_shift">-1</integer>

    <integer name="key_switch_alpha_symbol">-2</integer>

    <integer name="key_capslock">-3</integer>

    <integer name="key_output_text">-4</integer>

    <integer name="key_delete">-5</integer>

    <integer name="key_settings">-6</integer>

java/res/xml-ar/keyboard_set.xml

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
        latin:elementName="phone"

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

    <Element

        latin:elementName="phoneShifted"

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

        latin:elementName="phoneSymbols"

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

    <Element

        latin:elementName="number"

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

java/res/xml-be/keyboard_set.xml

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
        latin:elementName="phone"

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

    <Element

        latin:elementName="phoneShifted"

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

        latin:elementName="phoneSymbols"

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

    <Element

        latin:elementName="number"

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

java/res/xml-bg/keyboard_set.xml

+2 −2
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ 
        latin:elementName="phone"

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

    <Element

        latin:elementName="phoneShifted"

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

        latin:elementName="phoneSymbols"

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

    <Element

        latin:elementName="number"

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