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

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

Simplify the Key's on state transition 

Because handling shift locked state of alphabet keyboard is done by
KeyboardSwitcher, there is no need to change the "on" state of Key
when releasing the key. On the other hand, symbol and symbol shifted
keyboard has fixed "on" state "ALT/MORE" key.

This change also renames the attribute "isModifier" to "isFunctional".

Change-Id: I082885bd2376ae26bdfc378c14add2b5d6be1d4e
parent 73edb401

java/res/values/attrs.xml

+2 −2
Original line number Diff line number Diff line
@@ -107,8 +107,8 @@ 
            <!-- Key is anchored to the right of the keyboard. -->

            <flag name="right" value="2" />

        </attr>

        <!-- Whether this is a modifier key such as Alt or Shift. -->

        <attr name="isModifier" format="boolean" />

        <!-- Whether this is a functional key which has different key top than normal key. -->

        <attr name="isFunctional" format="boolean" />

        <!-- Whether this is a toggle key. -->

        <attr name="isSticky" format="boolean" />

        <!-- Whether long-pressing on this key will make it repeat. -->

java/res/xml-xlarge/kbd_key_styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        >

            <key-style

                latin:styleName="functionalKeyStyle"

                latin:isModifier="true" />

                latin:isFunctional="true" />

            <key-style

                latin:styleName="shiftKeyStyle"

                latin:code="@integer/key_shift"

java/res/xml/kbd_key_styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        >

            <key-style

                latin:styleName="functionalKeyStyle"

                latin:isModifier="true" />

                latin:isFunctional="true" />

            <key-style

                latin:styleName="shiftKeyStyle"

                latin:code="@integer/key_shift"

java/res/xml/kbd_qwerty_black_symbol.xml

+4 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 
                        latin:keyIcon="@drawable/sym_bkeyboard_123_mic"

                        latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"

                        latin:keyWidth="20%p"

                        latin:isModifier="true"

                        latin:isFunctional="true"

                        latin:keyEdgeFlags="left" />

                </case>

                <default>
@@ -46,7 +46,7 @@ 
                        latin:code="@integer/key_switch_alpha_symbol"

                        latin:keyLabel="@string/label_to_symbol_key"

                        latin:keyWidth="20%p"

                        latin:isModifier="true"

                        latin:isFunctional="true"

                        latin:keyEdgeFlags="left" />

                </default>

            </switch>
@@ -67,7 +67,7 @@ 
                        latin:keyIcon="@drawable/sym_bkeyboard_123_mic"

                        latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"

                        latin:keyWidth="15%p"

                        latin:isModifier="true"

                        latin:isFunctional="true"

                        latin:keyEdgeFlags="left" />

                </case>

                <default>
@@ -75,7 +75,7 @@ 
                        latin:code="@integer/key_switch_alpha_symbol"

                        latin:keyLabel="@string/label_to_symbol_key"

                        latin:keyWidth="15%p"

                        latin:isModifier="true"

                        latin:isFunctional="true"

                        latin:keyEdgeFlags="left" />

                </default>

            </switch>

java/res/xml/kbd_qwerty_f1.xml

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
                latin:keyLabel="/"

                latin:keyHintIcon="@drawable/hint_popup"

                latin:popupCharacters="@string/alternates_for_settings_slash"

                latin:isModifier="true" />

                latin:isFunctional="true" />

        </case>

        <case

            latin:mode="email"
@@ -38,7 +38,7 @@ 
                latin:keyLabel="\@"

                latin:keyHintIcon="@drawable/hint_popup"

                latin:popupCharacters="@string/alternates_for_settings_at"

                latin:isModifier="true" />

                latin:isFunctional="true" />

        </case>

        <default>

            <switch>
@@ -57,7 +57,7 @@ 
                        >

                            <Key

                                latin:keyLabel=","

                                latin:isModifier="true" />

                                latin:isFunctional="true" />

                        </case>

                        <case

                            latin:hasSettingsKey="false"
@@ -66,7 +66,7 @@ 
                                latin:keyLabel=","

                                latin:keyHintIcon="@drawable/hint_popup"

                                latin:popupCharacters="@string/alternates_for_settings_comma"

                                latin:isModifier="true" />

                                latin:isFunctional="true" />

                        </case>

                    </switch>

                </case>