diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 290ab5008..769a1d986 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -218,7 +218,12 @@
+
+
+
+
+
diff --git a/java/res/values/keyboard-icons-lmp.xml b/java/res/values/keyboard-icons-lmp.xml
index a9cbabca6..39e0fe306 100644
--- a/java/res/values/keyboard-icons-lmp.xml
+++ b/java/res/values/keyboard-icons-lmp.xml
@@ -26,7 +26,13 @@
- @drawable/sym_keyboard_settings_holo_dark
- @drawable/sym_keyboard_space_holo_dark
- @drawable/sym_keyboard_return_holo_dark
+
+
- @drawable/sym_keyboard_search_holo_dark
+
+
+
+
- @drawable/sym_keyboard_tab_holo_dark
- @drawable/sym_keyboard_voice_holo_dark
- @drawable/sym_keyboard_space_holo_dark
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
index 0699e4527..99ac10873 100644
--- a/java/res/xml-sw600dp/key_styles_enter.xml
+++ b/java/res/xml-sw600dp/key_styles_enter.xml
@@ -115,6 +115,16 @@
latin:keySpec="!icon/enter_key|!code/key_shift_enter"
latin:parentStyle="defaultEnterKeyStyle" />
+
+
+
@@ -124,6 +134,16 @@
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
+
+
+
@@ -133,6 +153,16 @@
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
+
+
+
@@ -142,6 +172,16 @@
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
+
+
+
@@ -151,6 +191,16 @@
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
+
+
+
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index acb27abb1..8bba136bd 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -282,6 +282,16 @@
latin:styleName="enterKeyStyle"
latin:parentStyle="emojiKeyStyle" />
+
+
+
@@ -291,6 +301,16 @@
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
+
+
+
@@ -300,6 +320,16 @@
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
+
+
+
@@ -309,6 +339,16 @@
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
+
+
+
@@ -318,6 +358,16 @@
latin:backgroundType="action"
latin:parentStyle="defaultEnterKeyStyle" />
+
+
+
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
index 6c9b5adc3..65d6a5633 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardIconsSet.java
@@ -42,7 +42,12 @@ public final class KeyboardIconsSet {
public static final String NAME_SPACE_KEY = "space_key";
public static final String NAME_SPACE_KEY_FOR_NUMBER_LAYOUT = "space_key_for_number_layout";
public static final String NAME_ENTER_KEY = "enter_key";
+ public static final String NAME_GO_KEY = "go_key";
public static final String NAME_SEARCH_KEY = "search_key";
+ public static final String NAME_SEND_KEY = "send_key";
+ public static final String NAME_NEXT_KEY = "next_key";
+ public static final String NAME_DONE_KEY = "done_key";
+ public static final String NAME_PREVIOUS_KEY = "previous_key";
public static final String NAME_TAB_KEY = "tab_key";
public static final String NANE_TAB_KEY_PREVIEW = "tab_key_preview";
public static final String NAME_SHORTCUT_KEY = "shortcut_key";
@@ -64,7 +69,12 @@ public final class KeyboardIconsSet {
NAME_SETTINGS_KEY, R.styleable.Keyboard_iconSettingsKey,
NAME_SPACE_KEY, R.styleable.Keyboard_iconSpaceKey,
NAME_ENTER_KEY, R.styleable.Keyboard_iconEnterKey,
+ NAME_GO_KEY, R.styleable.Keyboard_iconGoKey,
NAME_SEARCH_KEY, R.styleable.Keyboard_iconSearchKey,
+ NAME_SEND_KEY, R.styleable.Keyboard_iconSendKey,
+ NAME_NEXT_KEY, R.styleable.Keyboard_iconNextKey,
+ NAME_DONE_KEY, R.styleable.Keyboard_iconDoneKey,
+ NAME_PREVIOUS_KEY, R.styleable.Keyboard_iconPreviousKey,
NAME_TAB_KEY, R.styleable.Keyboard_iconTabKey,
NAME_SHORTCUT_KEY, R.styleable.Keyboard_iconShortcutKey,
NAME_SPACE_KEY_FOR_NUMBER_LAYOUT, R.styleable.Keyboard_iconSpaceKeyForNumberLayout,