This fixes unit tests and brings us closer to a green build.

Change-Id: Iffcc392eda4a7671a238b79cc7367320ca648725

Change-Id: I546f3b1943999a41803222bd14f9ddd23aa87a51

Change-Id: I90cc74ee882e8aa2b243885d3b994223ca3b6f44

Change-Id: Ib9dbbb4bd4e35c15fd752c364d3012e8a7da2410

Diff:
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
@@ -735,7 +735,7 @@ public class KeyboardBuilder<KP extends KeyboardParams> {

     private boolean matchLocaleCodes(TypedArray caseAttr, final Locale[] locales) {
         // TODO: adujst this for multilingual input
-        return matchString(caseAttr, R.styleable.Keyboard_Case_languageCode, locales[0].toString());
+        return matchString(caseAttr, R.styleable.Keyboard_Case_localeCode, locales[0].toString());
     }

     private boolean matchLanguageCodes(TypedArray caseAttr, Locale[] locales) {

Change-Id: Icefac18dd6d5fea97f591177cf8df1ba6de7f4f0

This reverts commit 15dbd382.

Bug: 11230254

Reverting due to unit test breakage.

Change-Id: Icf29ba5c808c754515aef2d1b4162d72f606acfe

Bug: 11230254
Change-Id: Idf3ed27b396d63ade9800c72c5ce0ed613f5f669

This reverts commit a63d0a8e.

This patch seems to be fine after all, but was submitted without its companion [ML1.1] patch causing a build breakage. Reverting the revert and submitting both at the same time seems like the right thing to do.

Change-Id: Ib8fefa40b74dcee0edb025a52dac9b35c82d49df

This reverts commit 8ffe4bc9.

Change-Id: I9d4c98b0adfdb78b0f4d376f7691e50d1bd2228f

Bug: 11230254
Change-Id: Ic7a1bf938a5a186dcff527b556295aba2406e8b9

Remove country name from space bar text when there no other subtype
that is a same language and a same keyboard layout.

Bug: 8084704
Change-Id: I7c785a925ff7a0a61e5d009f138e1df52b3aeb3a