Rebase to upstream hg 1371linaro-master

Change-Id: I3f02d1fe86cca16d08a807260413288ed34278b9
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>

7 files changed, 29 insertions, 15 deletions

diff --git a/java/res/values-es-rUS/donottranslate-altchars.xml b/java/res/values-es-rUS/donottranslate-altchars.xml
index 431a41a..1406cb4 100644
--- a/java/res/values-es-rUS/donottranslate-altchars.xml
+++ b/java/res/values-es-rUS/donottranslate-altchars.xml
@@ -19,7 +19,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">áàâãäåæ</string>
-    <string name="alternates_for_e">3éèêë</string>
+    <string name="alternates_for_e">3éèêë€</string>
     <string name="alternates_for_i">8íìïî</string>
     <string name="alternates_for_o">9óòõôöœø</string>
     <string name="alternates_for_u">7úùüû</string>
diff --git a/java/res/values-es/donottranslate-altchars.xml b/java/res/values-es/donottranslate-altchars.xml
index 2cfb992..4841cde 100644
--- a/java/res/values-es/donottranslate-altchars.xml
+++ b/java/res/values-es/donottranslate-altchars.xml
@@ -19,7 +19,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="alternates_for_a">á</string>
-    <string name="alternates_for_e">3é</string>
+    <string name="alternates_for_e">3é€</string>
     <string name="alternates_for_i">8íìïî</string>
     <string name="alternates_for_o">9ó</string>
     <string name="alternates_for_u">7úùüû</string>
diff --git a/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java b/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java
index ba2f174..62a5b6a 100644
--- a/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java
+++ b/java/src/org/pocketworkstation/pckeyboard/InputLanguageSelection.java
@@ -69,17 +69,17 @@ public class InputLanguageSelection extends PreferenceActivity {
     // the available keyboard resources and dictionaries.
     private static final String[] KBD_LOCALIZATIONS = {
         "ar", "bg", "ca", "cs", "cs_QY", "da", "de", "el", "en", "en_DV",
-        "en_GB", "es", "es_US", "fa", "fi", "fr", "fr_CA", "he", "hr", "hu",
-        "hy", "in", "it", "iw", "ja", "ka", "ko", "lo", "lt", "lv", "nb",
-        "nl", "pl", "pt", "pt_PT", "rm", "ro", "ru", "ru_PH", "si", "sk",
-        "sk_QY", "sl", "sr", "sv", "th", "tl", "tr", "uk", "vi", "zh_CN",
-        "zh_TW"
+        "en_GB", "es", "es_LA", "es_US", "fa", "fi", "fr", "fr_CA", "he",
+        "hr", "hu", "hy", "in", "it", "iw", "ja", "ka", "ko", "lo", "lt",
+        "lv", "nb", "nl", "pl", "pt", "pt_PT", "rm", "ro", "ru", "ru_PH",
+        "si", "sk", "sk_QY", "sl", "sr", "sv", "th", "tl", "tr", "uk",
+        "vi", "zh_CN", "zh_TW"
     };
 
     private static final String[] KBD_5_ROW = {
         "ar", "bg", "cs", "cs_QY", "da", "de", "el", "en", "en_DV", "en_GB",
-        "es", "fa", "fi", "fr", "fr_CA", "he", "hr", "hy", "it", "iw",
-        "lo", "nb", "pt_PT", "ro", "ru", "ru_PH", "si", "sk", "sk_QY",
+        "es", "es_LA", "fa", "fi", "fr", "fr_CA", "he", "hr", "hy", "it",
+        "iw", "lo", "nb", "pt_PT", "ro", "ru", "ru_PH", "si", "sk", "sk_QY",
         "sl", "sr", "sv", "th", "tr", "uk"
     };
 
@@ -96,6 +96,8 @@ public class InputLanguageSelection extends PreferenceActivity {
             return "English (Dvorak)";
         } else if (lang.equals("en") && country.equals("EX")) {
                 return "English (4x11)";
+        } else if (lang.equals("es") && country.equals("LA")) {
+            return "Español (Latinoamérica)";
         } else if (lang.equals("cs") && country.equals("QY")) {
             return "Čeština (QWERTY)";
         } else if (lang.equals("sk") && country.equals("QY")) {
diff --git a/java/src/org/pocketworkstation/pckeyboard/LatinIME.java b/java/src/org/pocketworkstation/pckeyboard/LatinIME.java
index 5710549..d193d56 100644
--- a/java/src/org/pocketworkstation/pckeyboard/LatinIME.java
+++ b/java/src/org/pocketworkstation/pckeyboard/LatinIME.java
@@ -2137,6 +2137,16 @@ public class LatinIME extends InputMethodService implements
         InputConnection ic = getCurrentInputConnection();
         if (ic == null)
             return;
+        if (mPredicting && text.length() == 1) {
+            // If adding a single letter, treat it as a regular keystroke so
+            // that completion works as expected.
+            int c = text.charAt(0);
+            if (!isWordSeparator(c)) {
+                int[] codes = {c};
+                handleCharacter(c, codes);
+                return;
+            }
+        }
         abortCorrection(false);
         ic.beginBatchEdit();
         if (mPredicting) {
diff --git a/java/src/org/pocketworkstation/pckeyboard/LatinKeyboard.java b/java/src/org/pocketworkstation/pckeyboard/LatinKeyboard.java
index 7cd7475..d6e24d6 100644
--- a/java/src/org/pocketworkstation/pckeyboard/LatinKeyboard.java
+++ b/java/src/org/pocketworkstation/pckeyboard/LatinKeyboard.java
@@ -262,9 +262,7 @@ public class LatinKeyboard extends Keyboard {
 
     public void updateSymbolIcons(boolean isAutoCompletion) {
         updateDynamicKeys();
-        if (mSpaceKey != null) {
-            updateSpaceBarForLocale(isAutoCompletion);
-        }
+        updateSpaceBarForLocale(isAutoCompletion);
     }
 
     private void setDefaultBounds(Drawable drawable) {
@@ -398,6 +396,7 @@ public class LatinKeyboard extends Keyboard {
     }
 
     private void updateSpaceBarForLocale(boolean isAutoCompletion) {
+        if (mSpaceKey == null) return;
         // If application locales are explicitly selected.
         if (mLocale != null) {
             mSpaceKey.icon = new BitmapDrawable(mRes,
@@ -873,7 +872,7 @@ public class LatinKeyboard extends Keyboard {
             mHeight = height;
             mTextPaint = new TextPaint();
             mTextPaint.setTextSize(getTextSizeFromTheme(android.R.style.TextAppearance_Medium, 18));
-            mTextPaint.setColor(R.color.latinkeyboard_transparent);
+            mTextPaint.setColor(mRes.getColor(R.color.latinkeyboard_transparent));
             mTextPaint.setTextAlign(Align.CENTER);
             mTextPaint.setAlpha(OPACITY_FULLY_OPAQUE);
             mTextPaint.setAntiAlias(true);
diff --git a/java/src/org/pocketworkstation/pckeyboard/LatinKeyboardBaseView.java b/java/src/org/pocketworkstation/pckeyboard/LatinKeyboardBaseView.java
index 6940200..40ed799 100644
--- a/java/src/org/pocketworkstation/pckeyboard/LatinKeyboardBaseView.java
+++ b/java/src/org/pocketworkstation/pckeyboard/LatinKeyboardBaseView.java
@@ -804,7 +804,8 @@ public class LatinKeyboardBaseView extends View implements PointerTracker.UIProx
         } else {
             int width = mKeyboard.getMinWidth() + getPaddingLeft() + getPaddingRight();
             if (MeasureSpec.getSize(widthMeasureSpec) < width + 10) {
-                width = MeasureSpec.getSize(widthMeasureSpec);
+                int badWidth = MeasureSpec.getSize(widthMeasureSpec);
+                if (badWidth != width) Log.i(TAG, "ignoring unexpected width=" + badWidth);
             }
             Log.i(TAG, "onMeasure width=" + width);
             setMeasuredDimension(
diff --git a/java/src/org/pocketworkstation/pckeyboard/SeekBarPreference.java b/java/src/org/pocketworkstation/pckeyboard/SeekBarPreference.java
index 0ecf254..82de858 100644
--- a/java/src/org/pocketworkstation/pckeyboard/SeekBarPreference.java
+++ b/java/src/org/pocketworkstation/pckeyboard/SeekBarPreference.java
@@ -1,5 +1,7 @@
 package org.pocketworkstation.pckeyboard;
 
+import java.util.Locale;
+
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.preference.DialogPreference;
@@ -103,7 +105,7 @@ public class SeekBarPreference extends DialogPreference {
             val = min + delta;
         }
         // Hack: Round number to 2 significant digits so that it looks nicer.
-        val = Float.valueOf(String.format("%.2g", val));
+        val = Float.valueOf(String.format(Locale.US, "%.2g", val));
         return val;
     }