commit a3e47f87805f31edfc93c0701bb25c788eb3c707
author Baligh Uddin <baligh@google.com> Fri Mar 22 05:01:10 2013 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 22 05:01:10 2013 +0000
tree 069cf10f5a45d2e2d5f6108fb94b08d6cdab2c1d
parent 140b6705ece0559f2ea9647044b3baf6a314f3d3
parent 74089a0946fa804e13497931a1c15e94a445f6ad

am 74089a09: am ba0e497a: Merge commit \'525bbec9eccbf5bd4581c2b9908e46f61c4431ad\' into jb-mr2-dev

* commit '74089a0946fa804e13497931a1c15e94a445f6ad': (93 commits)
  am 9da7fa0f: am 559616fb: Prevent keyboard A11y proxy from referencing a null keyboard view.
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  ...

java/res/values/strings-appname.xml

diff --git a/java/res/values/strings-appname.xml b/java/res/values/strings-appname.xml
index 19aaa25..ad25ff6 100644
--- a/java/res/values/strings-appname.xml
+++ b/java/res/values/strings-appname.xml
@@ -20,14 +20,14 @@
 
 <resources>
     <!-- Title for Latin Keyboard  -->
-    <string name="english_ime_name">Android keyboard</string>
+    <string name="english_ime_name">Android Keyboard</string>
 
     <!-- Name of Android spell checker service -->
-    <string name="spell_checker_service_name">Android spell checker</string>
+    <string name="spell_checker_service_name">Android Spell Checker</string>
 
     <!-- Title for Latin keyboard settings activity / dialog -->
-    <string name="english_ime_settings">Android keyboard settings</string>
+    <string name="english_ime_settings">Android Keyboard Settings</string>
 
     <!-- Title for the spell checking service settings screen -->
-    <string name="android_spell_checker_settings">Spell checking settings</string>
+    <string name="android_spell_checker_settings">Android Spell Checker Settings</string>
 </resources>

java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java

diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
index ab851bd..8ae1b88 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardBuilder.java
@@ -24,7 +24,6 @@
 import android.util.Log;
 import android.util.TypedValue;
 import android.util.Xml;
-import android.view.InflateException;
 
 import com.android.inputmethod.annotations.UsedForTesting;
 import com.android.inputmethod.keyboard.Key;
@@ -750,7 +749,7 @@
 
     private void endRow(final KeyboardRow row) {
         if (mCurrentRow == null) {
-            throw new InflateException("orphan end row tag");
+            throw new RuntimeException("orphan end row tag");
         }
         if (mRightEdgeKey != null) {
             mRightEdgeKey.markAsRightEdge(mParams);