nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Fix suggestion strip geometry"

main
Tadashi G. Takaoka 2011-05-09 20:52:16 -07:00 committed by Android (Google) Code Review
parent 3d994a48a2 37b6b44a90
commit 14a5f53c27
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
java/res/layout-xlarge/candidate.xml
View File

@ -23,14 +23,15 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingRight="@dimen/candidate_padding"
> >
<ImageView <ImageView
android:id="@+id/candidate_divider" android:id="@+id/candidate_divider"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/keyboard_suggest_strip_divider" 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:focusable="false"
android:clickable="false" android:clickable="false"
android:gravity="center_vertical|center_horizontal" /> android:gravity="center_vertical|center_horizontal" />
@ -44,8 +45,7 @@
android:background="@drawable/btn_candidate_holo" android:background="@drawable/btn_candidate_holo"
android:focusable="true" android:focusable="true"
android:clickable="true" android:clickable="true"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal" />
android:paddingLeft="@dimen/candidate_padding" />
<TextView <TextView
android:id="@+id/candidate_debug_info" android:id="@+id/candidate_debug_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"

8
java/res/layout/candidate.xml
View File

@ -23,14 +23,15 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingRight="@dimen/candidate_padding"
> >
<ImageView <ImageView
android:id="@+id/candidate_divider" android:id="@+id/candidate_divider"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:src="@drawable/keyboard_suggest_strip_divider" 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:focusable="false"
android:clickable="false" android:clickable="false"
android:gravity="center_vertical|center_horizontal" /> android:gravity="center_vertical|center_horizontal" />
@ -44,8 +45,7 @@
android:background="@drawable/btn_candidate" android:background="@drawable/btn_candidate"
android:focusable="true" android:focusable="true"
android:clickable="true" android:clickable="true"
android:gravity="center_vertical|center_horizontal" android:gravity="center_vertical|center_horizontal" />
android:paddingLeft="@dimen/candidate_padding" />
<TextView <TextView
android:id="@+id/candidate_debug_info" android:id="@+id/candidate_debug_info"
android:layout_width="wrap_content" android:layout_width="wrap_content"

4
java/res/values-xlarge/dimens.xml
View File

@ -50,7 +50,7 @@
key_preview_height_holo - key_preview_offset_holo + alpha --> key_preview_height_holo - key_preview_offset_holo + alpha -->
<dimen name="candidate_strip_minimum_height">18mm</dimen> <dimen name="candidate_strip_minimum_height">18mm</dimen>
<dimen name="candidate_strip_padding">15.0mm</dimen> <dimen name="candidate_strip_padding">15.0mm</dimen>
<dimen name="candidate_min_width">0.3in</dimen> <dimen name="candidate_min_width">46dip</dimen>
<dimen name="candidate_padding">12dip</dimen> <dimen name="candidate_padding">8dip</dimen>
<dimen name="candidate_text_size">22dip</dimen> <dimen name="candidate_text_size">22dip</dimen>
</resources> </resources>

4
java/res/values/dimens.xml
View File

@ -57,8 +57,8 @@
<dimen name="candidate_strip_minimum_height">100sp</dimen> <dimen name="candidate_strip_minimum_height">100sp</dimen>
<dimen name="candidate_strip_fading_edge_length">63dip</dimen> <dimen name="candidate_strip_fading_edge_length">63dip</dimen>
<dimen name="candidate_strip_padding">0dip</dimen> <dimen name="candidate_strip_padding">0dip</dimen>
<dimen name="candidate_min_width">0.3in</dimen> <dimen name="candidate_min_width">32dip</dimen>
<dimen name="candidate_padding">1dip</dimen> <dimen name="candidate_padding">6dip</dimen>
<dimen name="candidate_text_size">18dip</dimen> <dimen name="candidate_text_size">18dip</dimen>
<dimen name="spacebar_vertical_correction">4dip</dimen> <dimen name="spacebar_vertical_correction">4dip</dimen>
<!-- If the screen height in landscape is larger than the below value, then the keyboard <!-- If the screen height in landscape is larger than the below value, then the keyboard

2
java/src/com/android/inputmethod/latin/CandidateView.java
View File

@ -150,7 +150,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
tv.setOnLongClickListener(this); tv.setOnLongClickListener(this);
ImageView divider = (ImageView)v.findViewById(R.id.candidate_divider); ImageView divider = (ImageView)v.findViewById(R.id.candidate_divider);
// Do not display divider of first candidate. // Do not display divider of first candidate.
divider.setVisibility(i == 0 ? GONE : VISIBLE); divider.setVisibility(i == 0 ? INVISIBLE : VISIBLE);
mWords.add(v); mWords.add(v);
} }