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

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

Use margin instead of padding in SuggestionStripView 

This CL also tunes the width of suggestions strip to be able to
display 15~16 letters without x-scaling at the center slot.

Bug: 14419121
Change-Id: Ia5766cee043899533e24e2ebc621e8dc279370b3
parent 35acf309

java/res/layout/input_view.xml

+0 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ 
            android:layout_width="match_parent"

            android:layout_height="@dimen/config_suggestions_strip_height"

            android:gravity="center_vertical"

            android:paddingRight="@dimen/config_suggestions_strip_horizontal_padding"

            android:paddingLeft="@dimen/config_suggestions_strip_horizontal_padding"

            style="?attr/suggestionStripViewStyle" />



        <!-- To ensure that key preview popup is correctly placed when the current system locale is

java/res/layout/suggestions_strip.xml

+8 −2
Original line number Diff line number Diff line
@@ -24,12 +24,16 @@ 
        android:id="@+id/suggestions_strip"

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />

        android:layout_height="match_parent"

        android:layout_marginLeft="@dimen/config_suggestions_strip_horizontal_margin"

        android:layout_marginRight="@dimen/config_suggestions_strip_horizontal_margin" />

    <LinearLayout

        android:id="@+id/add_to_dictionary_strip"

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginLeft="@dimen/config_suggestions_strip_horizontal_margin"

        android:layout_marginRight="@dimen/config_suggestions_strip_horizontal_margin"

        android:visibility="invisible">

        <TextView

            android:id="@+id/word_to_save"
@@ -49,7 +53,9 @@ 
        android:id="@+id/important_notice_strip"

        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="match_parent"

        android:layout_marginLeft="@dimen/config_suggestions_strip_horizontal_margin"

        android:layout_marginRight="@dimen/config_suggestions_strip_horizontal_margin">

        <TextView

            android:id="@+id/important_notice_title"

            android:layout_width="match_parent"

java/res/values-land/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ 
    <fraction name="config_key_shifted_letter_hint_ratio_5row">48%</fraction>



    <dimen name="config_suggestions_strip_height">36dp</dimen>

    <dimen name="config_suggestions_strip_horizontal_margin">54dp</dimen>

    <dimen name="config_more_suggestions_row_height">36dp</dimen>

    <integer name="config_max_more_suggestions_row">2</integer>

    <fraction name="config_min_more_suggestions_width">60%</fraction>

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

+2 −1
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ 
    <fraction name="config_key_letter_ratio_5row">62%</fraction>

    <fraction name="config_key_shifted_letter_hint_ratio_5row">36%</fraction>



    <dimen name="config_suggestions_strip_horizontal_padding">252.0dp</dimen>

    <dimen name="config_suggestions_strip_height">44dp</dimen>

    <dimen name="config_suggestions_strip_horizontal_margin">180.0dp</dimen>

    <integer name="config_max_more_suggestions_row">5</integer>

    <fraction name="config_min_more_suggestions_width">50%</fraction>

java/res/values-sw600dp/config.xml

+2 −2
Original line number Diff line number Diff line
@@ -63,12 +63,12 @@ 
    <fraction name="config_key_shifted_letter_hint_ratio_5row">27%</fraction>



    <dimen name="config_suggestions_strip_height">44dp</dimen>

    <dimen name="config_suggestions_strip_horizontal_margin">0dp</dimen>

    <dimen name="config_more_suggestions_row_height">44dp</dimen>

    <integer name="config_max_more_suggestions_row">6</integer>

    <fraction name="config_min_more_suggestions_width">90%</fraction>

    <dimen name="config_suggestions_strip_horizontal_padding">94.5dp</dimen>

    <dimen name="config_suggestion_min_width">48.0dp</dimen>

    <dimen name="config_suggestion_text_horizontal_padding">12dp</dimen>

    <dimen name="config_suggestion_text_horizontal_padding">10dp</dimen>

    <dimen name="config_suggestion_text_size">22dp</dimen>

    <dimen name="config_more_suggestions_hint_text_size">33dp</dimen>