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

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

Merge "Fix suggestion strip geometry"

parents 3d994a48 37b6b44a

java/res/layout-xlarge/candidate.xml

+4 −4
Original line number Diff line number Diff line
@@ -23,14 +23,15 @@ 
    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:paddingRight="@dimen/candidate_padding"

>

    <ImageView

        android:id="@+id/candidate_divider"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:src="@drawable/keyboard_suggest_strip_divider"

        android:visibility="gone"

        android:paddingRight="@dimen/candidate_padding"

        android:paddingLeft="@dimen/candidate_padding"

        android:visibility="invisible"

        android:focusable="false"

        android:clickable="false"

        android:gravity="center_vertical|center_horizontal" />
@@ -44,8 +45,7 @@ 
        android:background="@drawable/btn_candidate_holo"

        android:focusable="true"

        android:clickable="true"

        android:gravity="center_vertical|center_horizontal"

        android:paddingLeft="@dimen/candidate_padding" />

        android:gravity="center_vertical|center_horizontal" />

    <TextView

        android:id="@+id/candidate_debug_info"

        android:layout_width="wrap_content"

java/res/layout/candidate.xml

+4 −4
Original line number Diff line number Diff line
@@ -23,14 +23,15 @@ 
    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:paddingRight="@dimen/candidate_padding"

>

    <ImageView

        android:id="@+id/candidate_divider"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:src="@drawable/keyboard_suggest_strip_divider"

        android:visibility="gone"

        android:paddingRight="@dimen/candidate_padding"

        android:paddingLeft="@dimen/candidate_padding"

        android:visibility="invisible"

        android:focusable="false"

        android:clickable="false"

        android:gravity="center_vertical|center_horizontal" />
@@ -44,8 +45,7 @@ 
        android:background="@drawable/btn_candidate"

        android:focusable="true"

        android:clickable="true"

        android:gravity="center_vertical|center_horizontal"

        android:paddingLeft="@dimen/candidate_padding" />

        android:gravity="center_vertical|center_horizontal" />

    <TextView

        android:id="@+id/candidate_debug_info"

        android:layout_width="wrap_content"

java/res/values-xlarge/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
         key_preview_height_holo - key_preview_offset_holo + alpha -->

    <dimen name="candidate_strip_minimum_height">18mm</dimen>

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

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

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

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

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

    <dimen name="candidate_text_size">22dip</dimen>

</resources>

java/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -57,8 +57,8 @@ 
    <dimen name="candidate_strip_minimum_height">100sp</dimen>

    <dimen name="candidate_strip_fading_edge_length">63dip</dimen>

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

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

    <dimen name="candidate_padding">1dip</dimen>

    <dimen name="candidate_min_width">32dip</dimen>

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

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

    <dimen name="spacebar_vertical_correction">4dip</dimen>

    <!-- If the screen height in landscape is larger than the below value, then the keyboard

java/src/com/android/inputmethod/latin/CandidateView.java

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo 
                tv.setOnLongClickListener(this);

            ImageView divider = (ImageView)v.findViewById(R.id.candidate_divider);

            // Do not display divider of first candidate.

            divider.setVisibility(i == 0 ? GONE : VISIBLE);

            divider.setVisibility(i == 0 ? INVISIBLE : VISIBLE);

            mWords.add(v);

        }