diff options
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/candidate_divider.xml | 9 | ||||
| -rw-r--r-- | java/res/layout/candidate_word.xml | 5 | ||||
| -rw-r--r-- | java/res/layout/candidates_strip.xml | 88 |
3 files changed, 36 insertions, 66 deletions
diff --git a/java/res/layout/candidate_divider.xml b/java/res/layout/candidate_divider.xml index 748163074..a1059dc2f 100644 --- a/java/res/layout/candidate_divider.xml +++ b/java/res/layout/candidate_divider.xml @@ -18,12 +18,13 @@ */ --> -<ImageView +<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="match_parent" - android:src="@drawable/keyboard_suggest_strip_divider" + android:text="@string/label_candidate_divider" + android:textSize="@dimen/candidate_text_size" + android:gravity="center" android:padding="0dp" android:focusable="false" - android:clickable="false" - android:gravity="center_vertical|center_horizontal" /> + android:clickable="false" /> diff --git a/java/res/layout/candidate_word.xml b/java/res/layout/candidate_word.xml index 7b6db2fe8..b711e8f29 100644 --- a/java/res/layout/candidate_word.xml +++ b/java/res/layout/candidate_word.xml @@ -18,16 +18,19 @@ */ --> -<Button +<TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" android:minWidth="@dimen/candidate_min_width" android:textSize="@dimen/candidate_text_size" + android:gravity="center" android:paddingLeft="@dimen/candidate_padding" android:paddingTop="0dp" android:paddingRight="@dimen/candidate_padding" android:paddingBottom="0dp" + android:focusable="false" + android:clickable="false" android:singleLine="true" android:ellipsize="none" style="?attr/suggestionBackgroundStyle" /> diff --git a/java/res/layout/candidates_strip.xml b/java/res/layout/candidates_strip.xml index ea6708ee7..0f542c0a2 100644 --- a/java/res/layout/candidates_strip.xml +++ b/java/res/layout/candidates_strip.xml @@ -25,73 +25,39 @@ <LinearLayout android:id="@+id/candidates_strip" android:orientation="horizontal" - android:layout_width="match_parent" + android:layout_weight="1.0" + android:layout_width="0dp" android:layout_height="match_parent" > - <RelativeLayout - android:layout_weight="1.0" - android:layout_width="0dp" - android:layout_height="match_parent" + </LinearLayout> + <LinearLayout + android:id="@+id/candidates_pane_control" + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="match_parent" + > + <TextView + android:id="@+id/expand_candidates_pane" + android:text="@string/label_expand_candidates_pane" android:gravity="center" - > - <include - android:id="@+id/word_left" - layout="@layout/candidate_word" /> - <include - android:id="@+id/info_left" - layout="@layout/candidate_info" /> - </RelativeLayout> - <include - layout="@layout/candidate_divider" /> - <RelativeLayout - android:layout_weight="1.0" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="match_parent" + android:minWidth="30dp" + android:textSize="@dimen/candidate_text_size" + android:padding="0dp" + android:visibility="visible" + style="?attr/suggestionBackgroundStyle" /> + <TextView + android:id="@+id/close_candidates_pane" + android:text="@string/label_close_candidates_pane" android:gravity="center" - > - <include - android:id="@+id/word_center" - layout="@layout/candidate_word" /> - <include - android:id="@+id/info_center" - layout="@layout/candidate_info" /> - </RelativeLayout> - <include - layout="@layout/candidate_divider" /> - <LinearLayout - android:orientation="horizontal" - android:layout_weight="1.0" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="match_parent" - android:gravity="center_vertical" - > - <RelativeLayout - android:layout_weight="1.0" - android:layout_width="0dp" - android:layout_height="match_parent" - android:gravity="center" - > - <include - android:id="@+id/word_right" - layout="@layout/candidate_word" /> - <include - android:id="@+id/info_right" - layout="@layout/candidate_info" /> - </RelativeLayout> - <!-- Image drawables are set in CandidateView constructor --> - <ImageButton - android:id="@+id/expand_candidates_pane" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:background="@null" /> - <ImageButton - android:id="@+id/close_candidates_pane" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:background="@null" /> - </LinearLayout> + android:minWidth="30dp" + android:textSize="@dimen/candidate_text_size" + android:padding="0dp" + android:visibility="gone" + style="?attr/suggestionBackgroundStyle" /> </LinearLayout> <LinearLayout android:id="@+id/touch_to_save" |