Use dedicated layout for "touch to save word" feature
Change-Id: Ie8c948476740a645d8b2d9a9d821236941d27adf
diff --git a/java/res/layout/candidates_strip.xml b/java/res/layout/candidates_strip.xml
index bb11e05..3509a48 100644
--- a/java/res/layout/candidates_strip.xml
+++ b/java/res/layout/candidates_strip.xml
@@ -22,42 +22,10 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <RelativeLayout
- android:layout_weight="1.0"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- 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_height="match_parent"
- 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:id="@+id/candidates_strip"
+ android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center_vertical"
>
<RelativeLayout
android:layout_weight="1.0"
@@ -66,24 +34,89 @@
android:gravity="center"
>
<include
- android:id="@+id/word_right"
+ android:id="@+id/word_left"
layout="@layout/candidate_word" />
<include
- android:id="@+id/info_right"
+ android:id="@+id/info_left"
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"
- style="?attr/suggestionsStripBackgroundStyle" />
- <ImageButton
- android:id="@+id/close_candidates_pane"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:visibility="gone"
- style="?attr/suggestionsStripBackgroundStyle" />
+ <include
+ layout="@layout/candidate_divider" />
+ <RelativeLayout
+ android:layout_weight="1.0"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ 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_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"
+ style="?attr/suggestionsStripBackgroundStyle" />
+ <ImageButton
+ android:id="@+id/close_candidates_pane"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:visibility="gone"
+ style="?attr/suggestionsStripBackgroundStyle" />
+ </LinearLayout>
+ </LinearLayout>
+ <LinearLayout
+ android:id="@+id/touch_to_save"
+ android:orientation="horizontal"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:visibility="gone"
+ >
+ <Button
+ android:id="@+id/word_to_save"
+ android:layout_weight="1.0"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:textSize="@dimen/candidate_text_size"
+ android:singleLine="true"
+ android:ellipsize="middle"
+ style="?attr/suggestionBackgroundStyle" />
+ <include
+ layout="@layout/candidate_divider" />
+ <TextView
+ android:layout_weight="2.0"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:gravity="left|center_vertical"
+ android:text="@string/hint_add_to_dictionary"
+ android:textSize="@dimen/candidate_text_size"
+ android:background="@null" />
</LinearLayout>
</merge>