6 files changed, 14 insertions, 6 deletions
diff --git a/java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png
new file mode 100644
index 000000000..8bb66b722
--- /dev/null
+++ b/java/res/drawable-hdpi/btn_keyboard_key_dark_active_holo.9.png
diff --git a/java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png
new file mode 100644
index 000000000..c8d7ee0af
--- /dev/null
+++ b/java/res/drawable-mdpi/btn_keyboard_key_dark_active_holo.9.png
diff --git a/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png b/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png
new file mode 100644
index 000000000..eba91db33
--- /dev/null
+++ b/java/res/drawable-xhdpi/btn_keyboard_key_dark_active_holo.9.png
diff --git a/java/res/drawable/btn_keyboard_key_ics.xml b/java/res/drawable/btn_keyboard_key_ics.xml
index 7335cc299..e893da133 100644
--- a/java/res/drawable/btn_keyboard_key_ics.xml
+++ b/java/res/drawable/btn_keyboard_key_ics.xml
@@ -23,6 +23,13 @@
     <item android:state_single="true"
           android:drawable="@drawable/btn_keyboard_key_dark_normal_holo" />
 
+    <!-- Action keys. -->
+
+    <item android:state_active="true" android:state_pressed="true"
+          android:drawable="@drawable/btn_keyboard_key_dark_pressed_holo" />
+    <item android:state_active="true"
+          android:drawable="@drawable/btn_keyboard_key_dark_active_holo" />
+
     <!-- Toggle keys. Use checkable/checked state. -->
 
     <item android:state_checkable="true" android:state_checked="true" android:state_pressed="true"
@@ -34,7 +41,7 @@
     <item android:state_checkable="true"
           android:drawable="@drawable/btn_keyboard_key_dark_normal_off_holo" />
 
-    <!-- Normal keys -->
+    <!-- Normal keys. -->
 
     <item android:state_pressed="true"
           android:drawable="@drawable/btn_keyboard_key_light_pressed_holo" />
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 3275cd017..0451c9f94 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -198,6 +198,7 @@
             <!-- This should be aligned with Key.BACKGROUND_TYPE_* -->
             <enum name="normal" value="0" />
             <enum name="functional" value="1" />
+            <enum name="action" value="2" />
         </attr>
         <!-- Whether this is a toggle key. -->
         <attr name="isSticky" format="boolean" />
diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml
index e1f68d4e2..9df647284 100644
--- a/java/res/xml/kbd_key_styles.xml
+++ b/java/res/xml/kbd_key_styles.xml
@@ -102,7 +102,7 @@
                 latin:code="@integer/key_return"
                 latin:keyLabel="@string/label_go_key"
                 latin:keyLabelOption="autoXScale"
-                latin:parentStyle="functionalKeyStyle" />
+                latin:backgroundType="action" />
         </case>
         <case
             latin:imeAction="actionNext"
@@ -112,7 +112,7 @@
                 latin:code="@integer/key_return"
                 latin:keyLabel="@string/label_next_key"
                 latin:keyLabelOption="autoXScale"
-                latin:parentStyle="functionalKeyStyle" />
+                latin:backgroundType="action" />
         </case>
         <case
             latin:imeAction="actionDone"
@@ -122,7 +122,7 @@
                 latin:code="@integer/key_return"
                 latin:keyLabel="@string/label_done_key"
                 latin:keyLabelOption="autoXScale"
-                latin:parentStyle="functionalKeyStyle" />
+                latin:backgroundType="action" />
         </case>
         <case
             latin:imeAction="actionSend"
@@ -132,7 +132,7 @@
                 latin:code="@integer/key_return"
                 latin:keyLabel="@string/label_send_key"
                 latin:keyLabelOption="autoXScale"
-                latin:parentStyle="functionalKeyStyle" />
+                latin:backgroundType="action" />
         </case>
         <case
             latin:imeAction="actionSearch"
@@ -141,7 +141,7 @@
                 latin:styleName="returnKeyStyle"
                 latin:code="@integer/key_return"
                 latin:keyIcon="iconSearchKey"
-                latin:parentStyle="functionalKeyStyle" />
+                latin:backgroundType="action" />
         </case>
         <default>
             <key-style