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

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

Merge "Use separate View for key preview backing"

parents e197542a abb0c77a

java/res/layout/input_view.xml

+5 −2
Original line number Diff line number Diff line
@@ -25,6 +25,11 @@ 
    android:layout_width="match_parent"

    android:layout_height="wrap_content"

>

    <View

        android:id="@+id/key_preview_backing"

        android:layout_width="match_parent"

        android:layout_height="@dimen/key_preview_backing_height" />



    <!-- On tablets, the suggestions strip is centered with horizontal paddings on both sides

         because width of the landscape mode is too long for the suggestions strip. This

         LinearLayout is required to hold the paddings. -->
@@ -33,8 +38,6 @@ 
        android:orientation="horizontal"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:minHeight="@dimen/suggestions_view_minimum_height"

        android:gravity="bottom"

    >

        <View

            android:layout_width="@dimen/suggestions_strip_padding"

java/res/values-land/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ 


    <dimen name="suggestions_strip_height">36dip</dimen>

    <dimen name="more_suggestions_row_height">36dip</dimen>

    <dimen name="suggestions_view_minimum_height">160sp</dimen>

    <dimen name="key_preview_backing_height">36dip</dimen>

    <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->

    <!-- popup_key_height x 1.2 -->

    <dimen name="mini_keyboard_slide_allowance">0.336in</dimen>

java/res/values-sw600dp/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 


    <dimen name="suggestions_strip_height">44dip</dimen>

    <dimen name="more_suggestions_row_height">44dip</dimen>

    <dimen name="key_preview_backing_height">44dip</dimen>

    <dimen name="suggestions_strip_padding">15.0mm</dimen>

    <dimen name="suggestion_min_width">0.3in</dimen>

    <dimen name="suggestion_padding">12dip</dimen>

java/res/values-sw768dp/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ 


    <dimen name="suggestions_strip_height">44dip</dimen>

    <dimen name="more_suggestions_row_height">44dip</dimen>

    <dimen name="suggestions_view_minimum_height">200sp</dimen>

    <dimen name="key_preview_backing_height">44dip</dimen>

    <dimen name="suggestions_strip_padding">15.0mm</dimen>

    <dimen name="suggestion_min_width">46dip</dimen>

    <dimen name="suggestion_padding">8dip</dimen>

java/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ 
    <dimen name="more_suggestions_row_height">40dip</dimen>

    <dimen name="more_suggestions_slide_allowance">0.2in</dimen>

    <fraction name="more_suggestions_info_ratio">12%</fraction>

    <dimen name="suggestions_view_minimum_height">200sp</dimen>

    <dimen name="key_preview_backing_height">40dip</dimen>

    <dimen name="suggestions_strip_padding">0dip</dimen>

    <dimen name="suggestion_min_width">44dip</dimen>

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