diff --git a/java/res/layout/suggestion_info.xml b/java/res/layout/suggestion_info.xml
deleted file mode 100644
index 0aa26000da5dc7ecc7ce6de1efcd7c9394c701c2..0000000000000000000000000000000000000000
--- a/java/res/layout/suggestion_info.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="6dp"
- android:textColor="@android:color/white"
- style="?attr/suggestionWordStyle" />
diff --git a/java/res/layout/suggestion_word.xml b/java/res/layout/suggestion_word.xml
deleted file mode 100644
index 47d2bd86432715fa054f0e684a4d381840455aaa..0000000000000000000000000000000000000000
--- a/java/res/layout/suggestion_word.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2011, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<!-- Provide a haptic feedback by ourselves based on the keyboard settings.
- We just need to ignore the system's haptic feedback settings. -->
-<TextView
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:minWidth="@dimen/config_suggestion_min_width"
- android:textSize="@dimen/config_suggestion_text_size"
- android:gravity="center"
- android:paddingLeft="@dimen/config_suggestion_text_horizontal_padding"
- android:paddingTop="0dp"
- android:paddingRight="@dimen/config_suggestion_text_horizontal_padding"
- android:paddingBottom="0dp"
- android:hapticFeedbackEnabled="false"
- android:focusable="false"
- android:clickable="false"
- android:singleLine="true"
- android:ellipsize="none"
- style="?attr/suggestionWordStyle" />
diff --git a/java/res/layout/suggestions_strip.xml b/java/res/layout/suggestions_strip.xml
index 85d60e681081b5149a7340bef4c78486f068cb6d..d8a65f6e5d353388b0087aca77f6464c7fe2c156 100644
--- a/java/res/layout/suggestions_strip.xml
+++ b/java/res/layout/suggestions_strip.xml
@@ -31,13 +31,17 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="invisible">
- <include
- layout="@layout/suggestion_word"
- android:id="@+id/word_to_save" />
+ <TextView
+ android:id="@+id/word_to_save"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ style="?attr/suggestionWordStyle" />
<include
layout="@layout/suggestion_divider" />
- <include
- layout="@layout/suggestion_word"
- android:id="@+id/hint_add_to_dictionary" />
+ <TextView
+ android:id="@+id/hint_add_to_dictionary"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ style="?attr/suggestionWordStyle" />
</LinearLayout>
</merge>
diff --git a/java/res/values/themes-common.xml b/java/res/values/themes-common.xml
index 7c9b51c0a27313151de82befb0190c7d300e5831..3bfd73a5565d66ac800a5229de73b34f3d648e89 100644
--- a/java/res/values/themes-common.xml
+++ b/java/res/values/themes-common.xml
@@ -127,7 +127,22 @@
<item name="maxMoreSuggestionsRow">@integer/config_max_more_suggestions_row</item>
<item name="minMoreSuggestionsWidth">@fraction/config_min_more_suggestions_width</item>
</style>
- <style name="SuggestionWord" />
+ <style name="SuggestionWord">
+ <item name="android:minWidth">@dimen/config_suggestion_min_width</item>
+ <item name="android:textSize">@dimen/config_suggestion_text_size</item>
+ <item name="android:gravity">center</item>
+ <item name="android:paddingLeft">@dimen/config_suggestion_text_horizontal_padding</item>
+ <item name="android:paddingTop">0dp</item>
+ <item name="android:paddingRight">@dimen/config_suggestion_text_horizontal_padding</item>
+ <item name="android:paddingBottom">0dp</item>
+ <!-- Provide a haptic feedback by ourselves based on the keyboard settings.
+ We just need to ignore the system's haptic feedback settings. -->
+ <item name="android:hapticFeedbackEnabled">false</item>
+ <item name="android:focusable">false</item>
+ <item name="android:clickable">false</item>
+ <item name="android:singleLine">true</item>
+ <item name="android:ellipsize">none</item>
+ </style>
<style name="MoreKeysKeyboardAnimation">
<item name="android:windowEnterAnimation">@anim/more_keys_keyboard_fadein</item>
<item name="android:windowExitAnimation">@anim/more_keys_keyboard_fadeout</item>
diff --git a/java/res/values/themes-gb.xml b/java/res/values/themes-gb.xml
index 52ecafd6296509cd7ec28cc789e3e7f6738cc22b..a460d4f7f8aa0d04c91270185c89920936413cb2 100644
--- a/java/res/values/themes-gb.xml
+++ b/java/res/values/themes-gb.xml
@@ -140,7 +140,11 @@
<item name="colorSuggested">@color/highlight_color_gb</item>
<item name="alphaObsoleted">50%</item>
</style>
- <style name="SuggestionWord.GB">
+ <style
+ name="SuggestionWord.GB"
+ parent="SuggestionWord"
+ >
<item name="android:background">@drawable/btn_suggestion_gb</item>
+ <item name="android:textColor">@color/highlight_color_gb</item>
</style>
</resources>
diff --git a/java/res/values/themes-ics.xml b/java/res/values/themes-ics.xml
index 125b640b6ebe15c6ac79256932527d63b1c36703..caea92186e8553d00ce6efc09f2d185e4a47a409 100644
--- a/java/res/values/themes-ics.xml
+++ b/java/res/values/themes-ics.xml
@@ -119,7 +119,11 @@
<item name="colorSuggested">@color/suggested_word_color_ics</item>
<item name="alphaObsoleted">70%</item>
</style>
- <style name="SuggestionWord.ICS">
+ <style
+ name="SuggestionWord.ICS"
+ parent="SuggestionWord"
+ >
<item name="android:background">@drawable/btn_suggestion_ics</item>
+ <item name="android:textColor">@color/highlight_color_ics</item>
</style>
</resources>
diff --git a/java/res/values/themes-klp.xml b/java/res/values/themes-klp.xml
index f6c076767c0dd247c77819fe288a282a7b2e61a0..0599fb65e741ee98013e4f17765c91b199a21373 100644
--- a/java/res/values/themes-klp.xml
+++ b/java/res/values/themes-klp.xml
@@ -119,7 +119,11 @@
<item name="colorSuggested">@color/suggested_word_color_klp</item>
<item name="alphaObsoleted">70%</item>
</style>
- <style name="SuggestionWord.KLP">
+ <style
+ name="SuggestionWord.KLP"
+ parent="SuggestionWord"
+ >
<item name="android:background">@drawable/btn_suggestion_klp</item>
+ <item name="android:textColor">@color/highlight_color_klp</item>
</style>
</resources>
diff --git a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
index 0ebf5cba5484cf92b8524472eda2a28ae4a96b43..5469ced7aff5e697df2413e2121a1cfeae7f6f92 100644
--- a/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
+++ b/java/src/com/android/inputmethod/latin/suggestions/SuggestionStripView.java
@@ -18,8 +18,10 @@ package com.android.inputmethod.latin.suggestions;
import android.content.Context;
import android.content.res.Resources;
+import android.graphics.Color;
import android.support.v4.view.ViewCompat;
import android.util.AttributeSet;
+import android.util.TypedValue;
import android.view.GestureDetector;
import android.view.LayoutInflater;
import android.view.MotionEvent;
@@ -56,6 +58,7 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
}
static final boolean DBG = LatinImeLogger.sDBG;
+ private static final float DEBUG_INFO_TEXT_SIZE_IN_DIP = 6.0f;
private final ViewGroup mSuggestionsStrip;
private final ViewGroup mAddToDictionaryStrip;
@@ -128,14 +131,17 @@ public final class SuggestionStripView extends RelativeLayout implements OnClick
mStripVisibilityGroup = new StripVisibilityGroup(mSuggestionsStrip, mAddToDictionaryStrip);
for (int pos = 0; pos < SuggestedWords.MAX_SUGGESTIONS; pos++) {
- final TextView word = (TextView)inflater.inflate(R.layout.suggestion_word, null);
+ final TextView word = new TextView(context, null, R.attr.suggestionWordStyle);
word.setOnClickListener(this);
word.setOnLongClickListener(this);
mWordViews.add(word);
final View divider = inflater.inflate(R.layout.suggestion_divider, null);
divider.setOnClickListener(this);
mDividerViews.add(divider);
- mDebugInfoViews.add((TextView)inflater.inflate(R.layout.suggestion_info, null));
+ final TextView info = new TextView(context, null, R.attr.suggestionWordStyle);
+ info.setTextColor(Color.WHITE);
+ info.setTextSize(TypedValue.COMPLEX_UNIT_DIP, DEBUG_INFO_TEXT_SIZE_IN_DIP);
+ mDebugInfoViews.add(info);
}
mLayoutHelper = new SuggestionStripLayoutHelper(