-Fixes FC when pressing the emoticons button as reported by abdulhafiz avarfor

for change I2bf0f4ef (http://review.cyanogenmod.com/#change,4637)
(I was not able to duplicate this before because as it turns out it only happens under non-Arabic locales)

-Renamed popup comma, punctuation and smiley XML files to be consistent with other keyboards

Change-Id: I9e48da671ae69351da15b1f030029c74ac3b5a99

7 files changed, 28 insertions, 28 deletions

diff --git a/java/res/xml-ar/kbd_qwerty.xml b/java/res/xml-ar/kbd_qwerty.xml
index b30711ed5..e28a6efb6 100644
--- a/java/res/xml-ar/kbd_qwerty.xml
+++ b/java/res/xml-ar/kbd_qwerty.xml
@@ -137,7 +137,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_return"
@@ -170,7 +170,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_return"
@@ -203,7 +203,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_return"
@@ -236,13 +236,13 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:keyLabel="(-:"
             android:keyOutputText=":-) "
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_smileys"
+            android:popupKeyboard="@xml/popup_smileys"
             android:keyWidth="20%p"
             android:isModifier="true"
             android:keyEdgeFlags="right" />
@@ -275,7 +275,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_return"
@@ -313,7 +313,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_return"
@@ -351,7 +351,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_return"
@@ -389,7 +389,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_return"
@@ -427,13 +427,13 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:keyLabel="(-:"
             android:keyOutputText=":-) "
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_smileys"
+            android:popupKeyboard="@xml/popup_smileys"
             android:keyWidth="25%p"
             android:isModifier="true"
             android:keyEdgeFlags="right" />
@@ -471,7 +471,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_return"
diff --git a/java/res/xml-ar/kbd_qwerty_black.xml b/java/res/xml-ar/kbd_qwerty_black.xml
index 715520df5..cc959a010 100644
--- a/java/res/xml-ar/kbd_qwerty_black.xml
+++ b/java/res/xml-ar/kbd_qwerty_black.xml
@@ -134,7 +134,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
@@ -162,7 +162,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
@@ -190,7 +190,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
@@ -218,12 +218,12 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:keyLabel="(-:"
             android:keyOutputText=":-) "
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_smileys"
+            android:popupKeyboard="@xml/popup_smileys"
             android:keyWidth="20%p"
             android:keyEdgeFlags="right" />
     </Row>
@@ -251,7 +251,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
@@ -283,7 +283,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
@@ -315,7 +315,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
@@ -347,7 +347,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
@@ -379,12 +379,12 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:keyLabel="(-:"
             android:keyOutputText=":-) "
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_smileys"
+            android:popupKeyboard="@xml/popup_smileys"
             android:keyWidth="25%p"
             android:keyEdgeFlags="right" />
     </Row>
@@ -416,7 +416,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
diff --git a/java/res/xml-ar/kbd_symbols.xml b/java/res/xml-ar/kbd_symbols.xml
index 47ce8a6c7..7ea1db447 100644
--- a/java/res/xml-ar/kbd_symbols.xml
+++ b/java/res/xml-ar/kbd_symbols.xml
@@ -172,7 +172,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_return"
@@ -209,7 +209,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation"
+            android:popupKeyboard="@xml/popup_punctuation"
             android:isModifier="true" />
         <Key
             android:codes="@integer/key_return"
diff --git a/java/res/xml-ar/kbd_symbols_black.xml b/java/res/xml-ar/kbd_symbols_black.xml
index 9efb9291e..1d2876a1c 100644
--- a/java/res/xml-ar/kbd_symbols_black.xml
+++ b/java/res/xml-ar/kbd_symbols_black.xml
@@ -168,7 +168,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
@@ -199,7 +199,7 @@
         <Key
             android:keyLabel="."
             android:keyIcon="@drawable/hint_popup"
-            android:popupKeyboard="@xml/ar_popup_punctuation" />
+            android:popupKeyboard="@xml/popup_punctuation" />
         <Key
             android:codes="@integer/key_return"
             android:keyIcon="@drawable/sym_bkeyboard_return"
diff --git a/java/res/xml-ar/ar_popup_comma.xml b/java/res/xml-ar/popup_comma.xml
index b0f1a5335..b0f1a5335 100644
--- a/java/res/xml-ar/ar_popup_comma.xml
+++ b/java/res/xml-ar/popup_comma.xml
diff --git a/java/res/xml-ar/ar_popup_punctuation.xml b/java/res/xml-ar/popup_punctuation.xml
index 62684e1b7..62684e1b7 100644
--- a/java/res/xml-ar/ar_popup_punctuation.xml
+++ b/java/res/xml-ar/popup_punctuation.xml
diff --git a/java/res/xml-ar/ar_popup_smileys.xml b/java/res/xml-ar/popup_smileys.xml
index 27a9b2f65..27a9b2f65 100644
--- a/java/res/xml-ar/ar_popup_smileys.xml
+++ b/java/res/xml-ar/popup_smileys.xml