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

Commit e966c803 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Tune up 7 inch keyboard layout"

parents 581335c3 237af54d

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

+4 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
<resources>

    <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 -->

    <dimen name="keyboardHeight">45.0mm</dimen>

    <fraction name="minKeyboardHeight">45%p</fraction>

    <!-- key_height + key_bottom_gap = popup_key_height -->

    <!-- <dimen name="key_height">14.5mm</dimen> -->

    <dimen name="key_bottom_gap">1.3mm</dimen>
@@ -31,10 +32,10 @@ 
    <!-- key_height x 1.0 -->

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



    <fraction name="key_letter_ratio">30.7%</fraction>

    <fraction name="key_label_ratio">21.9%</fraction>

    <fraction name="key_letter_ratio">45%</fraction>

    <fraction name="key_label_ratio">32%</fraction>

    <fraction name="key_hint_letter_ratio">23%</fraction>

    <fraction name="key_uppercase_letter_ratio">25%</fraction>

    <fraction name="key_uppercase_letter_ratio">29%</fraction>

    <!-- 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/dimens.xml

+4 −4
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <!-- keyboardHeight = key_height*4 + key_bottom_gap*3 -->

    <dimen name="keyboardHeight">48.0mm</dimen>

    <fraction name="maxKeyboardHeight">50%p</fraction>

    <fraction name="minKeyboardHeight">-61.8%p</fraction>

    <fraction name="minKeyboardHeight">-35.0%p</fraction>

    <!-- key_height + key_bottom_gap = popup_key_height -->

    <!-- <dimen name="key_height">14.5mm</dimen> -->

    <dimen name="key_bottom_gap">1.0mm</dimen>
@@ -39,10 +39,10 @@ 
    <!-- popup_key_height x -1.0 -->

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



    <fraction name="key_letter_ratio">45%</fraction>

    <fraction name="key_label_ratio">29%</fraction>

    <fraction name="key_letter_ratio">37%</fraction>

    <fraction name="key_label_ratio">22%</fraction>

    <fraction name="key_hint_letter_ratio">23%</fraction>

    <fraction name="key_uppercase_letter_ratio">35%</fraction>

    <fraction name="key_uppercase_letter_ratio">25%</fraction>

    <fraction name="key_preview_text_ratio">82%</fraction>

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

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

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

+3 −3
Original line number Diff line number Diff line
@@ -31,10 +31,10 @@ 
    <dimen name="keyboard_bottom_padding">0.0mm</dimen>

    <dimen name="keyboard_horizontal_edges_padding">0.0mm</dimen>



    <fraction name="key_letter_ratio">30.7%</fraction>

    <fraction name="key_label_ratio">21.9%</fraction>

    <fraction name="key_letter_ratio">38%</fraction>

    <fraction name="key_label_ratio">26%</fraction>

    <fraction name="key_hint_letter_ratio">23%</fraction>

    <fraction name="key_uppercase_letter_ratio">25%</fraction>

    <fraction name="key_uppercase_letter_ratio">24%</fraction>

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

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

    <dimen name="key_preview_height_holo">26.5mm</dimen>

java/res/values-sw768dp/dimens.xml

+4 −3
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
<resources>

    <!-- keyboardHeight = key_height*4 + key_bottom_gap*3, key_height=12mm -->

    <dimen name="keyboardHeight">48.0mm</dimen>

    <fraction name="maxKeyboardHeight">50%p</fraction>

    <fraction name="minKeyboardHeight">-35.0%p</fraction>

    <!-- key_height + key_bottom_gap = popup_key_height -->

    <!-- <dimen name="key_height">14.5mm</dimen> -->
@@ -38,10 +39,10 @@ 
    <!-- popup_key_height x -1.0 -->

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



    <fraction name="key_letter_ratio">34.4%</fraction>

    <fraction name="key_label_ratio">21.2%</fraction>

    <fraction name="key_letter_ratio">38%</fraction>

    <fraction name="key_label_ratio">26%</fraction>

    <fraction name="key_hint_letter_ratio">23%</fraction>

    <fraction name="key_uppercase_letter_ratio">28%</fraction>

    <fraction name="key_uppercase_letter_ratio">25%</fraction>

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

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

    <fraction name="key_preview_text_ratio">26.3%</fraction>

java/res/values/styles.xml

+8 −0
Original line number Diff line number Diff line
@@ -17,6 +17,14 @@ 
<resources>

    <!-- Theme "Basic" -->

    <style name="Keyboard">

        <item name="rowHeight">25%p</item>

        <item name="keyboardHeight">@dimen/keyboardHeight</item>

        <item name="maxKeyboardHeight">@fraction/maxKeyboardHeight</item>

        <item name="minKeyboardHeight">@fraction/minKeyboardHeight</item>

        <item name="popupKeyboardTemplate">@xml/kbd_popup_template</item>

        <item name="horizontalGap">@dimen/key_horizontal_gap</item>

        <item name="verticalGap">@dimen/key_bottom_gap</item>

        <item name="maxPopupKeyboardColumn">@integer/config_max_popup_keyboard_column</item>

    </style>

    <style name="LatinKeyboard">

        <item name="autoCorrectionSpacebarLedIcon">@drawable/sym_keyboard_space_led</item>