diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lmp.9.png
new file mode 100644
index 000000000..814e40235
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_dark_normal_on_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_lmp.9.png
new file mode 100644
index 000000000..90abe3940
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png
new file mode 100644
index 000000000..48eeb3f54
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png
new file mode 100644
index 000000000..71e0683cd
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_lmp.9.png
new file mode 100644
index 000000000..6768241a7
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_light_pressed_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lmp.9.png b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lmp.9.png
new file mode 100644
index 000000000..10f8e97e4
Binary files /dev/null and b/java/res/drawable-hdpi/btn_keyboard_key_popup_selected_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_background_lmp.9.png
new file mode 100644
index 000000000..be394151a
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_background_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lmp.9.png
new file mode 100644
index 000000000..9fa6d0003
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_left_background_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lmp.9.png
new file mode 100644
index 000000000..c73269b7e
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_left_more_background_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lmp.9.png
new file mode 100644
index 000000000..fffd4021e
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_more_background_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lmp.9.png
new file mode 100644
index 000000000..61c23c19b
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_right_background_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lmp.9.png
new file mode 100644
index 000000000..827d74363
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_key_feedback_right_more_background_lmp.9.png differ
diff --git a/java/res/drawable-hdpi/keyboard_popup_panel_background_lmp.9.png b/java/res/drawable-hdpi/keyboard_popup_panel_background_lmp.9.png
new file mode 100644
index 000000000..f9dd3b8b1
Binary files /dev/null and b/java/res/drawable-hdpi/keyboard_popup_panel_background_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lmp.9.png
new file mode 100644
index 000000000..b7b2dca43
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_dark_normal_on_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_lmp.9.png
new file mode 100644
index 000000000..4a92b80dd
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png
new file mode 100644
index 000000000..72125a065
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png
new file mode 100644
index 000000000..82413d4cc
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_lmp.9.png
new file mode 100644
index 000000000..049385984
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_light_pressed_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lmp.9.png b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lmp.9.png
new file mode 100644
index 000000000..ee0aae28b
Binary files /dev/null and b/java/res/drawable-mdpi/btn_keyboard_key_popup_selected_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_background_lmp.9.png
new file mode 100644
index 000000000..625490b1f
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_background_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lmp.9.png
new file mode 100644
index 000000000..427c87061
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_left_background_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lmp.9.png
new file mode 100644
index 000000000..ea757296d
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_left_more_background_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lmp.9.png
new file mode 100644
index 000000000..1911c429f
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_more_background_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lmp.9.png
new file mode 100644
index 000000000..cdef116d2
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_right_background_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lmp.9.png
new file mode 100644
index 000000000..dea5d076c
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_key_feedback_right_more_background_lmp.9.png differ
diff --git a/java/res/drawable-mdpi/keyboard_popup_panel_background_lmp.9.png b/java/res/drawable-mdpi/keyboard_popup_panel_background_lmp.9.png
new file mode 100644
index 000000000..896505518
Binary files /dev/null and b/java/res/drawable-mdpi/keyboard_popup_panel_background_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png
new file mode 100644
index 000000000..20251a000
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_lmp.9.png
new file mode 100644
index 000000000..84d173967
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png
new file mode 100644
index 000000000..ee4490eac
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png
new file mode 100644
index 000000000..e8124776c
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_lmp.9.png
new file mode 100644
index 000000000..f770962c3
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_light_pressed_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lmp.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lmp.9.png
new file mode 100644
index 000000000..891d00024
Binary files /dev/null and b/java/res/drawable-xhdpi/btn_keyboard_key_popup_selected_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lmp.9.png
new file mode 100644
index 000000000..c211d89c8
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_background_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lmp.9.png
new file mode 100644
index 000000000..543bc763e
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_left_background_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lmp.9.png
new file mode 100644
index 000000000..ec42aadb6
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_left_more_background_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lmp.9.png
new file mode 100644
index 000000000..319e9d7cf
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_more_background_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lmp.9.png
new file mode 100644
index 000000000..052032be7
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_right_background_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lmp.9.png
new file mode 100644
index 000000000..c7e9d1c9e
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_key_feedback_right_more_background_lmp.9.png differ
diff --git a/java/res/drawable-xhdpi/keyboard_popup_panel_background_lmp.9.png b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lmp.9.png
new file mode 100644
index 000000000..36df715b6
Binary files /dev/null and b/java/res/drawable-xhdpi/keyboard_popup_panel_background_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png
new file mode 100644
index 000000000..97f96258e
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_normal_on_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_lmp.9.png
new file mode 100644
index 000000000..dfb16a76b
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png
new file mode 100644
index 000000000..bf1d34686
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_off_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png
new file mode 100644
index 000000000..962277165
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_dark_pressed_on_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_lmp.9.png
new file mode 100644
index 000000000..17144b673
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_light_pressed_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lmp.9.png b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lmp.9.png
new file mode 100644
index 000000000..0cbb2ec84
Binary files /dev/null and b/java/res/drawable-xxhdpi/btn_keyboard_key_popup_selected_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lmp.9.png
new file mode 100644
index 000000000..fd2f9e514
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_background_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lmp.9.png
new file mode 100644
index 000000000..3ab79007e
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_background_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lmp.9.png
new file mode 100644
index 000000000..99543a1e0
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_left_more_background_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lmp.9.png
new file mode 100644
index 000000000..121411a06
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_more_background_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lmp.9.png
new file mode 100644
index 000000000..e9e379287
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_background_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lmp.9.png
new file mode 100644
index 000000000..6c1143aeb
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_key_feedback_right_more_background_lmp.9.png differ
diff --git a/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lmp.9.png b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lmp.9.png
new file mode 100644
index 000000000..91d5d7f90
Binary files /dev/null and b/java/res/drawable-xxhdpi/keyboard_popup_panel_background_lmp.9.png differ
diff --git a/java/res/drawable/btn_keyboard_key_functional_lmp.xml b/java/res/drawable/btn_keyboard_key_functional_lmp.xml
new file mode 100644
index 000000000..427b8d568
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_functional_lmp.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
diff --git a/java/res/drawable/btn_keyboard_key_ics.xml b/java/res/drawable/btn_keyboard_key_ics.xml
index 259bb9ba5..9db0eeef4 100644
--- a/java/res/drawable/btn_keyboard_key_ics.xml
+++ b/java/res/drawable/btn_keyboard_key_ics.xml
@@ -39,7 +39,7 @@
+ android:drawable="@android:color/transparent" />
-
+ android:drawable="@android:color/transparent" />
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/res/drawable/btn_keyboard_key_popup_ics.xml b/java/res/drawable/btn_keyboard_key_popup_ics.xml
index 31b613176..17d646b8f 100644
--- a/java/res/drawable/btn_keyboard_key_popup_ics.xml
+++ b/java/res/drawable/btn_keyboard_key_popup_ics.xml
@@ -17,5 +17,5 @@
-
+
diff --git a/java/res/drawable/btn_keyboard_key_popup_klp.xml b/java/res/drawable/btn_keyboard_key_popup_klp.xml
index 62cbca8ae..9dfc93ae8 100644
--- a/java/res/drawable/btn_keyboard_key_popup_klp.xml
+++ b/java/res/drawable/btn_keyboard_key_popup_klp.xml
@@ -17,5 +17,5 @@
-
+
diff --git a/java/res/drawable/btn_keyboard_key_popup_lmp.xml b/java/res/drawable/btn_keyboard_key_popup_lmp.xml
new file mode 100644
index 000000000..ebedaea3a
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_key_popup_lmp.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/java/res/drawable/btn_keyboard_spacebar_lmp.xml b/java/res/drawable/btn_keyboard_spacebar_lmp.xml
new file mode 100644
index 000000000..516cb0731
--- /dev/null
+++ b/java/res/drawable/btn_keyboard_spacebar_lmp.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
diff --git a/java/res/drawable/transparent.xml b/java/res/drawable/btn_suggestion_lmp.xml
similarity index 74%
rename from java/res/drawable/transparent.xml
rename to java/res/drawable/btn_suggestion_lmp.xml
index 855cf2ad5..c778e236f 100644
--- a/java/res/drawable/transparent.xml
+++ b/java/res/drawable/btn_suggestion_lmp.xml
@@ -2,7 +2,7 @@
-
-
-
-
+
+
diff --git a/java/res/drawable/keyboard_key_feedback_lmp.xml b/java/res/drawable/keyboard_key_feedback_lmp.xml
new file mode 100644
index 000000000..cdbe64c38
--- /dev/null
+++ b/java/res/drawable/keyboard_key_feedback_lmp.xml
@@ -0,0 +1,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/res/values/colors.xml b/java/res/values/colors.xml
index 824928c6b..dabb4d65e 100644
--- a/java/res/values/colors.xml
+++ b/java/res/values/colors.xml
@@ -40,6 +40,12 @@
#D8F0F0F0
#B2F0F0F0
#99E0E0E0
+
+ @android:color/white
+ #FFF0F0F0
+ #D8F0F0F0
+ #B2F0F0F0
+ #99E0E0E0
#FFEBEBEB
#FF707070
diff --git a/java/res/values/keyboard-icons-holo.xml b/java/res/values/keyboard-icons-holo.xml
index 4c888d570..669d2c07d 100644
--- a/java/res/values/keyboard-icons-holo.xml
+++ b/java/res/values/keyboard-icons-holo.xml
@@ -21,9 +21,6 @@
+
diff --git a/java/res/values/themes-lmp.xml b/java/res/values/themes-lmp.xml
new file mode 100644
index 000000000..773da196d
--- /dev/null
+++ b/java/res/values/themes-lmp.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/java/res/xml-sw600dp/key_styles_common.xml b/java/res/xml-sw600dp/key_styles_common.xml
index 3d5556fe5..f9b959b76 100644
--- a/java/res/xml-sw600dp/key_styles_common.xml
+++ b/java/res/xml-sw600dp/key_styles_common.xml
@@ -78,7 +78,7 @@
latin:keyboardLayout="@xml/key_styles_enter" />
diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml
index 78e030132..773995fa8 100644
--- a/java/res/xml/key_styles_common.xml
+++ b/java/res/xml/key_styles_common.xml
@@ -87,7 +87,7 @@
latin:keyboardLayout="@xml/key_styles_enter" />
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java b/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
index 6176f6a3e..25be2a68b 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/expected/AbstractLayoutBase.java
@@ -109,6 +109,8 @@ public abstract class AbstractLayoutBase {
// Icon ids.
private static final int ICON_DELETE = KeyboardIconsSet.getIconId(
KeyboardIconsSet.NAME_DELETE_KEY);
+ private static final int ICON_SPACE = KeyboardIconsSet.getIconId(
+ KeyboardIconsSet.NAME_SPACE_KEY);
private static final int ICON_TAB = KeyboardIconsSet.getIconId(
KeyboardIconsSet.NAME_TAB_KEY);
private static final int ICON_SHORTCUT = KeyboardIconsSet.getIconId(
@@ -131,6 +133,5 @@ public abstract class AbstractLayoutBase {
ICON_LANGUAGE_SWITCH, Constants.CODE_LANGUAGE_SWITCH);
public static final ExpectedKey ENTER_KEY = key(ICON_ENTER, Constants.CODE_ENTER);
public static final ExpectedKey EMOJI_KEY = key(ICON_EMOJI, Constants.CODE_EMOJI);
- public static final ExpectedKey SPACE_KEY = key(
- StringUtils.newSingleCodePointString(Constants.CODE_SPACE));
+ public static final ExpectedKey SPACE_KEY = key(ICON_SPACE, Constants.CODE_SPACE);
}