aboutsummaryrefslogtreecommitdiffstats
path: root/java/res
diff options
context:
space:
mode:
Diffstat (limited to 'java/res')
-rw-r--r--java/res/layout/candidate.xml33
-rw-r--r--java/res/layout/candidate_divider.xml1
-rw-r--r--java/res/values/colors.xml6
3 files changed, 11 insertions, 29 deletions
diff --git a/java/res/layout/candidate.xml b/java/res/layout/candidate.xml
index aa2845fb4..8437bf90d 100644
--- a/java/res/layout/candidate.xml
+++ b/java/res/layout/candidate.xml
@@ -18,31 +18,14 @@
*/
-->
-<LinearLayout
+<Button
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
- android:orientation="horizontal"
->
- <Button
- android:id="@+id/candidate_word"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:minWidth="@dimen/candidate_min_width"
- android:textSize="@dimen/candidate_text_size"
- android:textColor="@color/candidate_normal"
- android:focusable="true"
- android:clickable="true"
- android:gravity="center_vertical|center_horizontal"
- style="?attr/suggestionBackgroundStyle" />
- <TextView
- android:id="@+id/candidate_debug_info"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:visibility="gone"
- android:textSize="10dip"
- android:textColor="#ff808080"
- android:focusable="false"
- android:clickable="false"
- android:gravity="bottom" />
-</LinearLayout>
+ android:minWidth="@dimen/candidate_min_width"
+ android:textSize="@dimen/candidate_text_size"
+ android:textColor="@color/candidate_typed_word"
+ android:focusable="true"
+ android:clickable="true"
+ android:gravity="center_vertical|center_horizontal"
+ style="?attr/suggestionBackgroundStyle" />
diff --git a/java/res/layout/candidate_divider.xml b/java/res/layout/candidate_divider.xml
index dc6738a4a..1d75e52b3 100644
--- a/java/res/layout/candidate_divider.xml
+++ b/java/res/layout/candidate_divider.xml
@@ -20,7 +20,6 @@
<ImageView
xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/candidate_divider"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/keyboard_suggest_strip_divider"
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 733a464cc..05d137e4b 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -18,9 +18,9 @@
*/
-->
<resources>
- <color name="candidate_normal">#FFFFFFFF</color>
- <color name="candidate_recommended">#FFFCAE00</color>
- <color name="candidate_other">#FFFCAE00</color>
+ <color name="candidate_typed_word">#FFFFFFFF</color>
+ <color name="candidate_auto_correct">#FFFCAE00</color>
+ <color name="candidate_suggested">#FFFCAE00</color>
<color name="latinkeyboard_bar_language_shadow_white">#80000000</color>
<color name="latinkeyboard_bar_language_shadow_black">#80FFFFFF</color>
<color name="latinkeyboard_bar_language_text">#FFC0C0C0</color>