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

Commit fb05e94a authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android Git Automerger
Browse files

am d8638ff3: Introduce new 7" keyboard layout (DO NOT MERGE) 

* commit 'd8638ff3':
  Introduce new 7" keyboard layout (DO NOT MERGE)
parents f274c580 d8638ff3

java/res/values-sw600dp-land/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
    <!-- key_height x 1.0 -->

    <dimen name="key_preview_height">13.0mm</dimen>



    <dimen name="key_letter_size">28dip</dimen>

    <dimen name="key_label_text_size">20dip</dimen>

    <dimen name="key_letter_size">25dip</dimen>

    <dimen name="key_label_text_size">18dip</dimen>

    <!-- left or right padding of label alignment -->

    <dimen name="key_label_horizontal_alignment_padding">18dip</dimen>

    <dimen name="candidate_strip_padding">40.0mm</dimen>

java/res/values-sw600dp/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
<resources>

    <bool name="config_enable_show_settings_key_option">true</bool>

    <bool name="config_enable_show_subtype_settings">false</bool>

    <!-- TODO: Set this false after layout debug -->

    <bool name="config_enable_show_voice_key_option">true</bool>

    <bool name="config_enable_show_popup_on_keypress_option">false</bool>

    <bool name="config_enable_show_recorrection_option">false</bool>

java/res/values-sw600dp/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
    <!-- popup_key_height x -1.0 -->

    <dimen name="mini_keyboard_vertical_correction">-13.0mm</dimen>



    <dimen name="key_letter_size">26dip</dimen>

    <dimen name="key_label_text_size">16dip</dimen>

    <dimen name="key_letter_size">24dip</dimen>

    <dimen name="key_label_text_size">14dip</dimen>

    <dimen name="key_preview_text_size_large">24dip</dimen>

    <!-- left or right padding of label alignment -->

    <dimen name="key_label_horizontal_alignment_padding">6dip</dimen>

java/res/xml-sw600dp/kbd_key_styles.xml

+71 −189
Original line number Diff line number Diff line
@@ -45,6 +45,14 @@ 
            <key-style

                latin:styleName="settingsPopupStyle"

                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="webTabKeyStyle"

                latin:code="@integer/key_tab"

                latin:keyIcon="@drawable/sym_keyboard_tab_holo"

                latin:iconPreview="@drawable/sym_keyboard_tab_holo"

                latin:keyHintIcon="@drawable/hint_popup_holo"

                latin:popupCharacters="\@drawable/sym_keyboard_settings|\@integer/key_settings"

                latin:parentStyle="functionalKeyStyle" />

          </case>

        <!-- latin:hasSettingsKey="false" -->

        <default>
@@ -53,6 +61,12 @@ 
                latin:keyHintIcon="@drawable/hint_popup_holo"

                latin:popupCharacters="\@drawable/sym_keyboard_settings|\@integer/key_settings"

                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="webTabKeyStyle"

                latin:code="@integer/key_tab"

                latin:keyIcon="@drawable/sym_keyboard_tab_holo"

                latin:iconPreview="@drawable/sym_keyboard_tab_holo"

                latin:parentStyle="functionalKeyStyle" />

        </default>

    </switch>

    <!-- Functional key styles -->
@@ -75,60 +89,39 @@ 
                latin:iconPreview="@drawable/sym_keyboard_feedback_delete"

                latin:parentStyle="functionalKeyStyle"

                latin:isRepeatable="true" />

            <switch>

                <!-- When this qwerty keyboard has no voice key but voice key is enabled, then

                     symbol keyboard will have mic key. That means we should use "?123mic" key

                     here. -->

                <case

                    latin:voiceKeyEnabled="true"

                    latin:hasVoiceKey="false"

                >

            <key-style

                        latin:styleName="toSymbolKeyStyle"

                        latin:code="@integer/key_switch_alpha_symbol"

                        latin:keyIcon="@drawable/sym_keyboard_123_mic"

                        latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"

                latin:styleName="returnKeyStyle"

                latin:code="@integer/key_return"

                latin:keyIcon="@drawable/sym_keyboard_return_holo"

                latin:iconPreview="@drawable/sym_keyboard_feedback_return"

                latin:parentStyle="functionalKeyStyle" />

                </case>

                <default>

            <key-style

                        latin:styleName="toSymbolKeyStyle"

                        latin:code="@integer/key_switch_alpha_symbol"

                        latin:keyLabel="@string/label_to_symbol_key"

                        latin:parentStyle="functionalKeyStyle" />

                </default>

            </switch>

                latin:styleName="spaceKeyStyle"

                latin:code="@integer/key_space"

                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />

            <key-style

                latin:styleName="nonSpecialBackgroundSpaceKeyStyle"

                latin:code="@integer/key_space"

                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />

            <key-style

                latin:styleName="smileyKeyStyle"

                latin:keyLabel=":-)"

                latin:keyOutputText=":-) "

                latin:keyHintIcon="@drawable/hint_popup_holo"

                latin:popupCharacters="@string/alternates_for_smiley"

                latin:maxPopupKeyboardColumn="5" />

            <key-style

                latin:styleName="settingsKeyStyle"

                latin:code="@integer/key_settings"

                latin:keyIcon="@drawable/sym_keyboard_settings_holo"

                latin:iconPreview="@drawable/sym_keyboard_feedback_settings"

                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="spaceKeyStyle"

                latin:code="@integer/key_space"

                latin:keyIcon="@drawable/sym_keyboard_space_holo"

                latin:iconPreview="@drawable/sym_keyboard_feedback_space"

                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="tabKeyStyle"

                latin:code="@integer/key_tab"

                latin:keyIcon="@drawable/sym_keyboard_tab"

                latin:iconPreview="@drawable/sym_keyboard_feedback_tab"

                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="micKeyStyle"

                latin:code="@integer/key_voice"

                latin:keyIcon="@drawable/sym_keyboard_voice_holo"

                latin:iconPreview="@drawable/sym_keyboard_voice_holo"

                latin:iconPreview="@drawable/sym_keyboard_feedback_mic"

                latin:parentStyle="settingsPopupStyle" />

            <!-- Note: This key style is not for functional tab key. This is used for the tab key

                 which is laid out as normal letter key. -->

            <key-style

                latin:styleName="nonSpecialBackgroundTabKeyStyle"

                latin:code="@integer/key_tab"

                latin:keyIcon="@drawable/sym_keyboard_tab"

                latin:iconPreview="@drawable/sym_keyboard_feedback_tab" />

        </case>

        <case

            latin:colorScheme="black"
@@ -148,170 +141,67 @@ 
                latin:iconPreview="@drawable/sym_keyboard_feedback_delete"

                latin:parentStyle="functionalKeyStyle"

                latin:isRepeatable="true" />

            <switch>

                <!-- When this qwerty keyboard has no voice key but voice key is enabled, then

                     symbol keyboard will have mic key. That means we should use "?123mic" key

                     here. -->

                <case

                    latin:voiceKeyEnabled="true"

                    latin:hasVoiceKey="false"

                >

            <key-style

                        latin:styleName="toSymbolKeyStyle"

                        latin:code="@integer/key_switch_alpha_symbol"

                        latin:keyIcon="@drawable/sym_bkeyboard_123_mic"

                        latin:iconPreview="@drawable/sym_keyboard_feedback_123_mic"

                latin:styleName="returnKeyStyle"

                latin:code="@integer/key_return"

                latin:keyIcon="@drawable/sym_bkeyboard_return"

                latin:iconPreview="@drawable/sym_keyboard_feedback_return"

                latin:parentStyle="functionalKeyStyle" />

                </case>

                <default>

            <key-style

                        latin:styleName="toSymbolKeyStyle"

                        latin:code="@integer/key_switch_alpha_symbol"

                        latin:keyLabel="@string/label_to_symbol_key"

                        latin:parentStyle="functionalKeyStyle" />

                </default>

            </switch>

                latin:styleName="spaceKeyStyle"

                latin:code="@integer/key_space"

                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />

            <key-style

                latin:styleName="nonSpecialBackgroundSpaceKeyStyle"

                latin:code="@integer/key_space"

                latin:iconPreview="@drawable/sym_keyboard_feedback_space" />

            <key-style

                latin:styleName="smileyKeyStyle"

                latin:keyLabel=":-)"

                latin:keyOutputText=":-) "

                latin:keyHintIcon="@drawable/hint_popup_holo"

                latin:popupCharacters="@string/alternates_for_smiley"

                latin:maxPopupKeyboardColumn="5" />

            <key-style

                latin:styleName="settingsKeyStyle"

                latin:code="@integer/key_settings"

                latin:keyIcon="@drawable/sym_bkeyboard_settings"

                latin:iconPreview="@drawable/sym_keyboard_feedback_settings"

                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="spaceKeyStyle"

                latin:code="@integer/key_space"

                latin:keyIcon="@drawable/sym_bkeyboard_space"

                latin:iconPreview="@drawable/sym_keyboard_feedback_space"

                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="tabKeyStyle"

                latin:code="@integer/key_tab"

                latin:keyIcon="@drawable/sym_bkeyboard_tab"

                latin:iconPreview="@drawable/sym_keyboard_feedback_tab"

                latin:parentStyle="functionalKeyStyle" />

            <key-style

                latin:styleName="micKeyStyle"

                latin:code="@integer/key_voice"

                latin:keyIcon="@drawable/sym_bkeyboard_mic"

                latin:iconPreview="@drawable/sym_keyboard_feedback_mic"

                latin:parentStyle="settingsPopupStyle" />

            <!-- Note: This key style is not for functional tab key. This is used for the tab key

                 which is laid out as normal letter key. -->

            <key-style

                latin:styleName="nonSpecialBackgroundTabKeyStyle"

                latin:code="@integer/key_tab"

                latin:keyIcon="@drawable/sym_bkeyboard_tab"

                latin:iconPreview="@drawable/sym_keyboard_feedback_tab" />

        </case>

    </switch>

    <!-- Return key style -->

    <switch>

        <case

            latin:imeAction="actionGo"

        >

            <key-style

                latin:styleName="returnKeyStyle"

                latin:code="@integer/key_return"

                latin:keyLabel="@string/label_go_key"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <case

            latin:imeAction="actionNext"

        >

            <key-style

                latin:styleName="returnKeyStyle"

                latin:code="@integer/key_return"

                latin:keyLabel="@string/label_next_key"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <case

            latin:imeAction="actionDone"

        >

            <key-style

                latin:styleName="returnKeyStyle"

                latin:code="@integer/key_return"

                latin:keyLabel="@string/label_done_key"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <case

            latin:imeAction="actionSend"

        >

            <key-style

                latin:styleName="returnKeyStyle"

                latin:code="@integer/key_return"

                latin:keyLabel="@string/label_send_key"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <case

            latin:imeAction="actionSearch"

        >

            <switch>

                <case

                    latin:colorScheme="white"

                >

                    <key-style

                        latin:styleName="returnKeyStyle"

                        latin:code="@integer/key_return"

                        latin:keyIcon="@drawable/sym_keyboard_search"

                        latin:iconPreview="@drawable/sym_keyboard_feedback_search"

                        latin:parentStyle="functionalKeyStyle" />

                </case>

                <case

                    latin:colorScheme="black"

                >

                    <key-style

                        latin:styleName="returnKeyStyle"

                        latin:code="@integer/key_return"

                        latin:keyIcon="@drawable/sym_bkeyboard_search"

                        latin:iconPreview="@drawable/sym_keyboard_feedback_search"

                        latin:parentStyle="functionalKeyStyle" />

        </case>

    </switch>

        </case>

        <default>

            <switch>

                <case

                    latin:colorScheme="white"

                >

                    <key-style

                        latin:styleName="returnKeyStyle"

                        latin:code="@integer/key_return"

                        latin:keyIcon="@drawable/sym_keyboard_return"

                        latin:iconPreview="@drawable/sym_keyboard_feedback_return"

                        latin:parentStyle="functionalKeyStyle" />

                </case>

                <case

                    latin:colorScheme="black"

                >

    <key-style

                        latin:styleName="returnKeyStyle"

                        latin:code="@integer/key_return"

                        latin:keyIcon="@drawable/sym_bkeyboard_return"

                        latin:iconPreview="@drawable/sym_keyboard_feedback_return"

        latin:styleName="toSymbolKeyStyle"

        latin:code="@integer/key_switch_alpha_symbol"

        latin:keyLabel="@string/label_to_symbol_key"

        latin:keyLabelOption="fontNormal"

        latin:parentStyle="functionalKeyStyle" />

                </case>

            </switch>

        </default>

    </switch>

    <key-style

        latin:styleName="toAlphaKeyStyle"

        latin:code="@integer/key_switch_alpha_symbol"

        latin:keyLabel="@string/label_to_alpha_key"

        latin:keyLabelOption="fontNormal"

        latin:parentStyle="functionalKeyStyle" />

    <key-style

        latin:styleName="altKeyStyle"

        latin:styleName="moreKeyStyle"

        latin:code="@integer/key_shift"

        latin:keyLabel="@string/label_alt_key"

        latin:keyLabel="@string/label_more_key"

        latin:keyLabelOption="fontNormal"

        latin:parentStyle="functionalKeyStyle"

        latin:isSticky="true" />

    <key-style

        latin:styleName="smileyKeyStyle"

        latin:keyLabel=":-)"

        latin:keyOutputText=":-) "

        latin:styleName="comKeyStyle"

        latin:keyLabel="@string/keylabel_for_popular_domain"

        latin:keyLabelOption="fontNormal"

        latin:keyOutputText="@string/keylabel_for_popular_domain"

        latin:keyHintIcon="@drawable/hint_popup_holo"

        latin:popupCharacters="@string/alternates_for_smiley"

        latin:maxPopupKeyboardColumn="5"

        latin:parentStyle="functionalKeyStyle" />

        latin:popupCharacters="@string/alternates_for_popular_domain" />

    <switch>

        <case

            latin:passwordInput="true"
@@ -319,20 +209,12 @@ 
            <key-style

                latin:styleName="nonPasswordSymbolKeyStyle"

                latin:enabled="false" />

            <key-style

                latin:styleName="nonPasswordFunctionalKeyStyle"

                latin:enabled="false"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <!-- latin:passwordInput="false" -->

        <default>

            <key-style

                latin:styleName="nonPasswordSymbolKeyStyle"

                latin:enabled="true" />

            <key-style

                latin:styleName="nonPasswordFunctionalKeyStyle"

                latin:enabled="true"

                latin:parentStyle="functionalKeyStyle" />

        </default>

    </switch>

</merge>

java/res/xml-sw600dp/kbd_qwerty_row1.xml

+5 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

>

    <Row

        latin:keyWidth="10%p"

        latin:keyWidth="9.1%p"

        latin:rowEdgeFlags="top"

    >

        <Key
@@ -65,7 +65,10 @@ 
        <Key

            latin:keyLabel="p"

            latin:keyHintIcon="@drawable/key_hint_num0_holo"

            latin:popupCharacters="@string/alternates_for_p"

            latin:popupCharacters="@string/alternates_for_p" />

        <Key

            latin:keyStyle="deleteKeyStyle"

            latin:keyWidth="9.2%p"

            latin:keyEdgeFlags="right" />

    </Row>

</merge>