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

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

Introduce autoXScale label option 

Bug: 5267649
Change-Id: I7fdcb98c209b7ccf73075ef3a4e758782fe161e3
parent f5ef30df

java/res/values/attrs.xml

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ 
            <flag name="hasHintLabel" value="0x800" />

            <flag name="withIconLeft" value="0x1000" />

            <flag name="withIconRight" value="0x2000" />

            <flag name="autoXScale" value="0x4000" />

        </attr>

        <!-- The icon to display on the key instead of the label. -->

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

java/res/xml-sw600dp/kbd_phone_shift.xml

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
        <Key

            latin:code="44"

            latin:keyLabel="@string/label_pause_key"

            latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"

            latin:keyWidth="9.25%p" />

        <Key

            latin:keyStyle="num1KeyStyle"
@@ -69,6 +70,7 @@ 
        <Key

            latin:code="59"

            latin:keyLabel="@string/label_wait_key"

            latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"

            latin:keyWidth="9.25%p" />

        <Key

            latin:keyStyle="num4KeyStyle"

java/res/xml-sw768dp/kbd_phone_shift.xml

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ 
        <Key

            latin:code="44"

            latin:keyLabel="@string/label_pause_key"

            latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"

            latin:keyWidth="8.047%p" />

        <Key

            latin:keyStyle="num1KeyStyle"
@@ -72,6 +73,7 @@ 
        <Key

            latin:code="59"

            latin:keyLabel="@string/label_wait_key"

            latin:keyLabelOption="followKeyHintLabelRatio|autoXScale"

            latin:keyWidth="8.047%p" />

        <Key

            latin:keyStyle="num4KeyStyle"

java/res/xml/kbd_key_styles.xml

+4 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 
                latin:styleName="returnKeyStyle"

                latin:code="@integer/key_return"

                latin:keyLabel="@string/label_go_key"

                latin:keyLabelOption="autoXScale"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <case
@@ -110,6 +111,7 @@ 
                latin:styleName="returnKeyStyle"

                latin:code="@integer/key_return"

                latin:keyLabel="@string/label_next_key"

                latin:keyLabelOption="autoXScale"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <case
@@ -119,6 +121,7 @@ 
                latin:styleName="returnKeyStyle"

                latin:code="@integer/key_return"

                latin:keyLabel="@string/label_done_key"

                latin:keyLabelOption="autoXScale"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <case
@@ -128,6 +131,7 @@ 
                latin:styleName="returnKeyStyle"

                latin:code="@integer/key_return"

                latin:keyLabel="@string/label_send_key"

                latin:keyLabelOption="autoXScale"

                latin:parentStyle="functionalKeyStyle" />

        </case>

        <case

java/res/xml/kbd_phone_shift.xml

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
        <Key

            latin:code="44"

            latin:keyLabel="@string/label_pause_key"

            latin:keyLabelOption="followKeyHintLabelRatio" />

            latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" />

        <Key

            latin:keyLabel=","

            latin:keyStyle="numKeyStyle" />
@@ -65,7 +65,7 @@ 
        <Key

            latin:code="59"

            latin:keyLabel="@string/label_wait_key"

            latin:keyLabelOption="followKeyHintLabelRatio" />

            latin:keyLabelOption="followKeyHintLabelRatio|autoXScale" />

        <Key

            latin:keyLabel="#"

            latin:keyStyle="numKeyStyle" />