diff --git a/java/res/layout-sw768dp/candidates.xml b/java/res/layout-sw768dp/candidates.xml
deleted file mode 100644
index 93b030422..000000000
--- a/java/res/layout-sw768dp/candidates.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/java/res/layout/candidate.xml b/java/res/layout/candidate.xml
index 8437bf90d..94ae2b44e 100644
--- a/java/res/layout/candidate.xml
+++ b/java/res/layout/candidate.xml
@@ -21,11 +21,7 @@
diff --git a/java/res/layout/candidates.xml b/java/res/layout/candidates.xml
deleted file mode 100644
index 2bcafc985..000000000
--- a/java/res/layout/candidates.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml
index c8820b02e..5da1a4826 100644
--- a/java/res/layout/input_view.xml
+++ b/java/res/layout/input_view.xml
@@ -25,12 +25,42 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
-
-
+
+ style="?attr/suggestionsStripBackgroundStyle"
+ >
+
+
+
+
+
+
+
+
diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
index 2512118d4..7c68c93f2 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardSwitcher.java
@@ -745,8 +745,7 @@ public class KeyboardSwitcher implements SharedPreferences.OnSharedPreferenceCha
}
}
- mKeyboardView = (LatinKeyboardView) mCurrentInputView.findViewById(
- R.id.latin_keyboard_view);
+ mKeyboardView = (LatinKeyboardView) mCurrentInputView.findViewById(R.id.keyboard_view);
mKeyboardView.setOnKeyboardActionListener(mInputMethodService);
mThemeIndex = themeIndex;
return mCurrentInputView;
diff --git a/java/src/com/android/inputmethod/latin/CandidateView.java b/java/src/com/android/inputmethod/latin/CandidateView.java
index a8381020f..b4f6b2c91 100644
--- a/java/src/com/android/inputmethod/latin/CandidateView.java
+++ b/java/src/com/android/inputmethod/latin/CandidateView.java
@@ -156,7 +156,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
tv.setOnLongClickListener(this);
mWords.add(tv);
if (i > 0) {
- View divider = inflater.inflate(R.layout.candidate_divider, null);
+ final View divider = inflater.inflate(R.layout.candidate_divider, null);
mDividers.add(divider);
}
}
@@ -198,7 +198,7 @@ public class CandidateView extends LinearLayout implements OnClickListener, OnLo
final int color;
if (isAutoCorrect && mConfigCandidateHighlightFontColorEnabled) {
color = mColorAutoCorrect;
- } else if (isSuggestedCandidate) {
+ } else if (isSuggestedCandidate && mConfigCandidateHighlightFontColorEnabled) {
color = mColorSuggestedCandidate;
} else {
color = mColorTypedWord;