12 files changed, 51 insertions, 14 deletions
diff --git a/java/res/drawable-hdpi/ic_add_circle_wht_24dp.png b/java/res/drawable-hdpi/ic_add_circle_wht_24dp.png
new file mode 100644
index 000000000..314c52137
--- /dev/null
+++ b/java/res/drawable-hdpi/ic_add_circle_wht_24dp.png
diff --git a/java/res/drawable-mdpi/ic_add_circle_wht_24dp.png b/java/res/drawable-mdpi/ic_add_circle_wht_24dp.png
new file mode 100644
index 000000000..11363b173
--- /dev/null
+++ b/java/res/drawable-mdpi/ic_add_circle_wht_24dp.png
diff --git a/java/res/drawable-xhdpi/ic_add_circle_wht_24dp.png b/java/res/drawable-xhdpi/ic_add_circle_wht_24dp.png
new file mode 100644
index 000000000..32a5b05ba
--- /dev/null
+++ b/java/res/drawable-xhdpi/ic_add_circle_wht_24dp.png
diff --git a/java/res/drawable-xxhdpi/ic_add_circle_wht_24dp.png b/java/res/drawable-xxhdpi/ic_add_circle_wht_24dp.png
new file mode 100644
index 000000000..a22c463f9
--- /dev/null
+++ b/java/res/drawable-xxhdpi/ic_add_circle_wht_24dp.png
diff --git a/java/res/drawable/btn_keyboard_key_lxx_dark.xml b/java/res/drawable/btn_keyboard_key_lxx_dark.xml
index bb1789ae3..c82c13829 100644
--- a/java/res/drawable/btn_keyboard_key_lxx_dark.xml
+++ b/java/res/drawable/btn_keyboard_key_lxx_dark.xml
@@ -15,6 +15,11 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Custom label action keys. -->
+    <item android:state_active="true" android:state_checked="true" android:state_pressed="true"
+          android:drawable="@color/key_background_pressed_lxx_dark" />
+    <item android:state_active="true" android:state_checked="true"
+          android:drawable="@color/key_background_lxx_dark" />
     <!-- Action keys. -->
     <item android:state_active="true" android:state_pressed="true"
           android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_dark" />
diff --git a/java/res/drawable/btn_keyboard_key_lxx_light.xml b/java/res/drawable/btn_keyboard_key_lxx_light.xml
index 60fe02dd2..f237fbea9 100644
--- a/java/res/drawable/btn_keyboard_key_lxx_light.xml
+++ b/java/res/drawable/btn_keyboard_key_lxx_light.xml
@@ -15,6 +15,11 @@
 -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Custom label action keys. -->
+    <item android:state_active="true" android:state_checked="true" android:state_pressed="true"
+          android:drawable="@color/key_background_pressed_lxx_light" />
+    <item android:state_active="true" android:state_checked="true"
+          android:drawable="@color/key_background_lxx_light" />
     <!-- Action keys. -->
     <item android:state_active="true" android:state_pressed="true"
           android:drawable="@drawable/btn_keyboard_key_active_pressed_lxx_light" />
diff --git a/java/res/menu/add_style.xml b/java/res/menu/add_style.xml
new file mode 100644
index 000000000..d1cab4bb5
--- /dev/null
+++ b/java/res/menu/add_style.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2014, 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.
+*/
+-->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/action_add_style"
+        android:icon="@drawable/ic_add_circle_wht_24dp"
+        android:title="@string/add_style"
+        android:showAsAction="always" />
+</menu>
+\ No newline at end of file
diff --git a/java/res/values-ta-rIN/strings-emoji-descriptions.xml b/java/res/values-ta-rIN/strings-emoji-descriptions.xml
index 47cb2db0f..863449d94 100644
--- a/java/res/values-ta-rIN/strings-emoji-descriptions.xml
+++ b/java/res/values-ta-rIN/strings-emoji-descriptions.xml
@@ -147,18 +147,18 @@
     <string name="spoken_emoji_1F170" msgid="3817698686602826773">"இரத்த வகை A"</string>
     <string name="spoken_emoji_1F171" msgid="3684218589626650242">"இரத்த வகை B"</string>
     <string name="spoken_emoji_1F17E" msgid="2978809190364779029">"இரத்த வகை O"</string>
-    <string name="spoken_emoji_1F17F" msgid="463634348668462040">"சதுரத்திற்குள் இலத்தீன் பெரிய எழுத்து P"</string>
+    <string name="spoken_emoji_1F17F" msgid="463634348668462040">"பார்கிங் லாட்"</string>
     <string name="spoken_emoji_1F18E" msgid="1650705325221496768">"இரத்த வகை AB"</string>
     <string name="spoken_emoji_1F191" msgid="5386969264431429221">"சதுரத்திற்குள் CL"</string>
-    <string name="spoken_emoji_1F192" msgid="8324226436829162496">"சதுரத்திற்குள் கூல்"</string>
-    <string name="spoken_emoji_1F193" msgid="4731758603321515364">"சதுரத்திற்குள் இலவசம்"</string>
-    <string name="spoken_emoji_1F194" msgid="4903128609556175887">"சதுரத்திற்குள் ஐடி"</string>
-    <string name="spoken_emoji_1F195" msgid="1433142500411060924">"சதுரத்திற்குள் புதிது"</string>
+    <string name="spoken_emoji_1F192" msgid="8324226436829162496">"சதுரத்திற்குள் cool"</string>
+    <string name="spoken_emoji_1F193" msgid="4731758603321515364">"சதுரத்திற்குள் free"</string>
+    <string name="spoken_emoji_1F194" msgid="4903128609556175887">"சதுரத்திற்குள் ID"</string>
+    <string name="spoken_emoji_1F195" msgid="1433142500411060924">"சதுரத்திற்குள் new"</string>
     <string name="spoken_emoji_1F196" msgid="8825160701159634202">"சதுரத்திற்குள் N G"</string>
-    <string name="spoken_emoji_1F197" msgid="7841079241554176535">"சதுரத்திற்குள் சரி"</string>
+    <string name="spoken_emoji_1F197" msgid="7841079241554176535">"சதுரத்திற்குள் OK"</string>
     <string name="spoken_emoji_1F198" msgid="7020298909426960622">"சதுரத்திற்குள் SOS"</string>
-    <string name="spoken_emoji_1F199" msgid="5971252667136235630">"சதுரத்திற்குள் ஆச்சர்யக்குறியுடன் கூடிய up"</string>
-    <string name="spoken_emoji_1F19A" msgid="4557270135899843959">"சதுரத்திற்குள் வெர்சஸ்"</string>
+    <string name="spoken_emoji_1F199" msgid="5971252667136235630">"சதுரத்திற்குள் up!"</string>
+    <string name="spoken_emoji_1F19A" msgid="4557270135899843959">"சதுரத்திற்குள் vs"</string>
     <string name="spoken_emoji_1F201" msgid="7000490044681139002">"சதுரத்திற்குள் கட்டகான கோகோ"</string>
     <string name="spoken_emoji_1F202" msgid="8560906958695043947">"சதுரத்திற்குள் கட்டகான சேவை"</string>
     <string name="spoken_emoji_1F21A" msgid="1496435317324514033">"சதுரத்திற்குள் இலவச ஐடியோகிராஃப்"</string>
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 9a2227321..e6215c254 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -270,9 +270,10 @@
             <enum name="empty" value="0" />
             <enum name="normal" value="1" />
             <enum name="functional" value="2" />
-            <enum name="action" value="3" />
-            <enum name="stickyOff" value="4" />
-            <enum name="stickyOn" value="5" />
+            <enum name="stickyOff" value="3" />
+            <enum name="stickyOn" value="4" />
+            <enum name="action" value="5" />
+            <enum name="customAction" value="6" />
         </attr>
         <!-- The key action flags. -->
         <attr name="keyActionFlags" format="integer">
diff --git a/java/res/xml-sw600dp/key_styles_enter.xml b/java/res/xml-sw600dp/key_styles_enter.xml
index 740bf3543..d0167d336 100644
--- a/java/res/xml-sw600dp/key_styles_enter.xml
+++ b/java/res/xml-sw600dp/key_styles_enter.xml
@@ -230,6 +230,7 @@
                 latin:styleName="enterKeyStyle"
                 latin:keySpec="dummy_label|!code/key_enter"
                 latin:keyLabelFlags="fromCustomActionLabel"
+                latin:backgroundType="customAction"
                 latin:parentStyle="defaultEnterKeyStyle" />
         </case>
         <!-- imeAction is either actionNone or actionUnspecified. -->
diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml
index 770bf3876..960c79c18 100644
--- a/java/res/xml/key_styles_enter.xml
+++ b/java/res/xml/key_styles_enter.xml
@@ -398,6 +398,7 @@
                 latin:styleName="enterKeyStyle"
                 latin:keySpec="dummy_label|!code/key_enter"
                 latin:keyLabelFlags="fromCustomActionLabel"
+                latin:backgroundType="customAction"
                 latin:parentStyle="defaultEnterKeyStyle" />
         </case>
         <!-- imeAction is either actionNone or actionUnspecified. -->
diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml
index 5021f33ee..cfe25d1c4 100644
--- a/java/res/xml/method.xml
+++ b/java/res/xml/method.xml
@@ -51,7 +51,7 @@
     fr_CH: French (Switzerland)/swiss
     gl_ES: Galician (Spain)/spanish
     hi: Hindi/hindi
-    (hi: Hindi/hindi_compact) # This is a preliminary keyboard layout.
+    hi: Hindi/hindi_compact
     hr: Croatian/qwertz
     hu: Hungarian/qwertz
     hy_AM: Armenian (Armenia) Phonetic/armenian_phonetic
@@ -346,8 +346,6 @@
             android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi,EmojiCapable"
             android:isAsciiCapable="false"
     />
-    <!-- TODO: This hindi_compact keyboard is a preliminary layout.
-               This isn't based on the final specification. -->
     <subtype android:icon="@drawable/ic_ime_switcher_dark"
             android:label="@string/subtype_generic_compact"
             android:subtypeId="0xe49c89a1"