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

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

Support time, date, and datetime keyboard 

Bug: 6030364
Change-Id: I2bd4daf264757d8f3fa7c946d10a39c36ccf5905
parent 96170384

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

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ 
    <!-- U+207F: "ⁿ" SUPERSCRIPT LATIN SMALL LETTER N

         U+2205: "∅" EMPTY SET -->

    <string name="more_keys_for_symbols_0">&#x207F;,&#x2205;</string>

    <string name="more_keys_for_am_pm">!fixedColumnOrder!2,!hasLabels!,\@string/label_time_am,\@string/label_time_pm</string>

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

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

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

java/res/values/donottranslate.xml

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,10 @@ 
    <!-- U+FF0A: "＊" FULLWIDTH ASTERISK

         U+FF03: "＃" FULLWIDTH NUMBER SIGN -->

    <string name="label_to_phone_symbols_key">&#xFF0A;&#xFF03;</string>

    <!-- Key label for "ante meridiem" -->

    <string name="label_time_am">"AM"</string>

    <!-- Key label for "post meridiem" -->

    <string name="label_time_pm">"PM"</string>



    <!--  Always show the suggestion strip -->

    <string name="prefs_suggestion_visibility_show_value">0</string>

java/res/xml-sw600dp/rows_number_normal.xml

+34 −8
Original line number Diff line number Diff line
@@ -63,10 +63,24 @@ 
            latin:keyLabel="/"

            latin:keyStyle="numKeyStyle"

            latin:keyWidth="9.25%p" />

        <switch>

            <case

                latin:mode="time|datetime"

            >

                <Key

                    latin:keyLabel=","

                    latin:keyLabelFlags="hasPopupHint"

                    latin:moreKeys="@string/more_keys_for_am_pm"

                    latin:keyStyle="numKeyStyle"

                    latin:keyWidth="9.25%p" />

            </case>

            <default>

                <Key

                    latin:keyLabel=","

                    latin:keyStyle="numKeyStyle"

                    latin:keyWidth="9.25%p" />

            </default>

        </switch>

        <Key

            latin:keyLabel="4"

            latin:keyStyle="numKeyStyle"
@@ -94,10 +108,22 @@ 
            latin:keyLabel=")"

            latin:keyStyle="numKeyStyle"

            latin:keyWidth="9.25%p" />

        <switch>

            <case

                latin:mode="time|datetime"

            >

                <Key

                    latin:keyLabel=":"

                    latin:keyStyle="numKeyStyle"

                    latin:keyWidth="9.25%p" />

            </case>

            <default>

                <Key

                    latin:keyLabel="="

                    latin:keyStyle="numKeyStyle"

                    latin:keyWidth="9.25%p" />

            </default>

        </switch>

        <Key

            latin:keyLabel="7"

            latin:keyStyle="numKeyStyle"

java/res/xml-sw768dp/rows_number_normal.xml

+34 −8
Original line number Diff line number Diff line
@@ -65,10 +65,24 @@ 
            latin:keyLabel="/"

            latin:keyStyle="numKeyStyle"

            latin:keyWidth="8.047%p" />

        <switch>

            <case

                latin:mode="time|datetime"

            >

                <Key

                    latin:keyLabel=","

                    latin:keyLabelFlags="hasPopupHint"

                    latin:moreKeys="@string/more_keys_for_am_pm"

                    latin:keyStyle="numKeyStyle"

                    latin:keyWidth="8.047%p" />

            </case>

            <default>

                <Key

                    latin:keyLabel=","

                    latin:keyStyle="numKeyStyle"

                    latin:keyWidth="8.047%p" />

            </default>

        </switch>

        <Key

            latin:keyLabel="4"

            latin:keyStyle="numKeyStyle"
@@ -96,10 +110,22 @@ 
            latin:keyLabel=")"

            latin:keyStyle="numKeyStyle"

            latin:keyWidth="8.047%p" />

        <switch>

            <case

                latin:mode="time|datetime"

            >

                <Key

                    latin:keyLabel=":"

                    latin:keyStyle="numKeyStyle"

                    latin:keyWidth="8.047%p" />

            </case>

            <default>

                <Key

                    latin:keyLabel="="

                    latin:keyStyle="numKeyStyle"

                    latin:keyWidth="8.047%p" />

            </default>

        </switch>

        <Key

            latin:keyLabel="7"

            latin:keyStyle="numKeyStyle"

java/res/xml/key_styles_number.xml

+11 −5
Original line number Diff line number Diff line
@@ -41,9 +41,12 @@ 
        latin:styleName="numberKeyStyle"

        latin:keyLabelFlags="alignLeftOfCenter|hasHintLabel"

        latin:parentStyle="numKeyStyle" />

    <!-- U+0030: "0" DIGIT ZERO

         U+002B: "+" PLUS SIGN -->

    <key-style

        latin:styleName="num0KeyStyle"

        latin:code="48"

        latin:code="0x0030"

        latin:altCode="0x002B"

        latin:keyLabel="0 +"

        latin:keyActionFlags="enableLongPress"

        latin:parentStyle="numberKeyStyle" />
@@ -91,10 +94,11 @@ 
        latin:keyLabel="9"

        latin:keyHintLabel="WXYZ"

        latin:parentStyle="numberKeyStyle" />

    <!-- U+FF0A: "＊" FULLWIDTH ASTERISK -->

    <!-- U+002A: "*" ASTERISK

         U+FF0A: "＊" FULLWIDTH ASTERISK -->

    <key-style

        latin:styleName="numStarKeyStyle"

        latin:code="42"

        latin:code="0x002A"

        latin:keyLabel="&#xFF0A;"

        latin:parentStyle="numKeyStyle" />

    <!-- Only for non-tablet device -->
@@ -108,15 +112,17 @@ 
        latin:code="@integer/key_switch_alpha_symbol"

        latin:keyLabel="@string/label_to_phone_numeric_key"

        latin:parentStyle="numModeKeyStyle" />

    <!-- U+002C: "," COMMA -->

    <key-style

        latin:styleName="numPauseKeyStyle"

        latin:code="44"

        latin:code="0x002C"

        latin:keyLabel="@string/label_pause_key"

        latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"

        latin:parentStyle="numKeyBaseStyle" />

    <!-- U+003B: ";" SEMICOLON -->

    <key-style

        latin:styleName="numWaitKeyStyle"

        latin:code="59"

        latin:code="0x003B"

        latin:keyLabel="@string/label_wait_key"

        latin:keyLabelFlags="followKeyHintLabelRatio|autoXScale"

        latin:parentStyle="numKeyBaseStyle" />