commit f4352c2ce3849444c4a930fe7e5319ecdfd5d18a
author Satoshi Kataoka <satok@google.com> Fri Mar 22 05:11:25 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 22 05:11:26 2013 +0000
tree 0985d724b2b7d8d4fdcc21bcf86f510d3484f91d
parent a3e47f87805f31edfc93c0701bb25c788eb3c707
parent 242c066dde910097d286082fd255d04e5aa684cb

Merge "Use correct appname resource"

java/res/values-pl/strings-appname.xml

diff --git a/java/res/values-pl/strings-appname.xml b/java/res/values-pl/strings-appname.xml
index 4d244d7..e460644 100644
--- a/java/res/values-pl/strings-appname.xml
+++ b/java/res/values-pl/strings-appname.xml
@@ -21,7 +21,10 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="english_ime_name" msgid="178705338187710493">"Klawiatura Android"</string>
-    <string name="spell_checker_service_name" msgid="6268342166872202903">"Sprawdzanie pisowni w Androidzie"</string>
-    <string name="english_ime_settings" msgid="7470027018752707691">"Ustawienia klawiatury Android"</string>
-    <string name="android_spell_checker_settings" msgid="8397842018475560441">"Ustawienia sprawdzania pisowni"</string>
+    <!-- no translation found for spell_checker_service_name (6268342166872202903) -->
+    <skip />
+    <!-- no translation found for english_ime_settings (7470027018752707691) -->
+    <skip />
+    <!-- no translation found for android_spell_checker_settings (8397842018475560441) -->
+    <skip />
 </resources>

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);