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

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

Settings key always exists in more keys of shortcut/f1 key 

This change also
  * Fix comman/f1 key for Arabic keyboard.
  * Removes "show settings key option" and related stuff.
  * Renames and simplifies F2 key to shortcut key on 7 inch tablet.

Change-Id: Ib1cf99ad00d9780a2f0d170260e756771e161521
parent fed72d60

java/res/values-ar/donottranslate-more-keys.xml

+2 −6
Original line number Diff line number Diff line
@@ -70,17 +70,13 @@ 
    <!-- U+066B: "٫" ARABIC DECIMAL SEPARATOR

         U+066C: "٬" ARABIC THOUSANDS SEPARATOR -->

    <string name="additional_more_keys_for_symbols_0">0,&#x066B;,&#x066C;</string>

    <!-- U+060C: "،" ARABIC COMMA -->

    <string name="keylabel_for_comma">&#x060C;</string>

    <string name="keylabel_for_f1">&#x060C;</string>

    <string name="more_keys_for_comma">"\\,"</string>

    <string name="keylabel_for_symbols_question">&#x061F;</string>

    <string name="keylabel_for_symbols_semicolon">&#x061B;</string>

    <!-- U+066A: "٪" ARABIC PERCENT SIGN -->

    <string name="keylabel_for_symbols_percent">&#x066A;</string>

    <string name="more_keys_for_comma">,</string>

    <!-- U+060C: "،" ARABIC COMMA -->

    <string name="more_keys_for_f1">&#x060C;</string>

    <string name="more_keys_for_f1_settings">\\,,\@icon/settingsKey|\@integer/key_settings</string>

    <string name="more_keys_for_f1_navigate">\\,,\@icon/tabKey|\@integer/key_tab</string>

    <string name="more_keys_for_symbols_question">\?</string>

    <string name="more_keys_for_symbols_semicolon">;</string>

    <!-- U+2030: "‰" PER MILLE SIGN -->

java/res/values-sw600dp/config.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
-->



<resources>

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

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

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

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

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

java/res/values-sw768dp/config.xml

+0 −2
Original line number Diff line number Diff line
@@ -19,8 +19,6 @@ 
-->



<resources>

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

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

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

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

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

java/res/values/attrs.xml

+0 −8
Original line number Diff line number Diff line
@@ -357,14 +357,6 @@ 
        </attr>

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

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

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

        <!-- This should be aligned with KeyboardID.F2KEY_MODE_* -->

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

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

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

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

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

        </attr>

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

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

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

java/res/values/config.xml

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 


<resources>

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

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

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

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

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

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