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

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

Merge "Dynamically determine key preview backing view height"

parents 898d8419 c8b0e579

java/res/layout/input_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,15 +20,15 @@ 


<com.android.inputmethod.latin.InputView

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

>

    <!-- The height of key_preview_backing view will automatically be determined by code. -->

    <View

        android:id="@+id/key_preview_backing"

        android:layout_width="match_parent"

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

        android:layout_height="0dip" />



    <!-- 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

java/res/values-land/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -64,8 +64,6 @@ 
    <dimen name="more_suggestions_row_height">36dip</dimen>

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

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

    <!-- key_preview_backing_height = more_suggestions_row_height * max_more_suggestions_row -->

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

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

    <!-- popup_key_height x 1.2 -->

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

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

+0 −2
Original line number Diff line number Diff line
@@ -53,6 +53,4 @@ 
    <dimen name="suggestions_strip_padding">40.0mm</dimen>

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

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

    <!-- key_preview_backing_height = more_suggestions_row_height * max_more_suggestions_row -->

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

</resources>

java/res/values-sw600dp/dimens.xml

+0 −2
Original line number Diff line number Diff line
@@ -72,8 +72,6 @@ 
    <dimen name="more_suggestions_row_height">44dip</dimen>

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

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

    <!-- key_preview_backing_height = more_suggestions_row_height * max_more_suggestions_row -->

    <dimen name="key_preview_backing_height">264dip</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

+0 −2
Original line number Diff line number Diff line
@@ -75,8 +75,6 @@ 
    <dimen name="more_suggestions_row_height">44dip</dimen>

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

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

    <!-- key_preview_backing_height = more_suggestions_row_height * max_more_suggestions_row -->

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

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

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

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