LatinIME: Update ukrainian layout.

Add Ukrainian apostroph symbol.
Because of history and codepages reasons ukrainians
use u0027 or u2019 as apostroph. Unicode gives us correct symbol
and only it will be allowed in host names in ukrainian zone .укр

Remove hard sign from ukrainian layout. This is russian symbol.
It does not used in ukrainian language.

Change-Id: I78541eb2cea806bb18e52eb42bc828a5ff7fe42f

4 files changed, 23 insertions, 8 deletions

diff --git a/java/res/xml/rowkeys_east_slavic3.xml b/java/res/xml/rowkeys_east_slavic3.xml
index 1480aeb4a..368eabf95 100644
--- a/java/res/xml/rowkeys_east_slavic3.xml
+++ b/java/res/xml/rowkeys_east_slavic3.xml
@@ -35,7 +35,7 @@
     <Key
         latin:keyLabel="&#x0441;"
         latin:keyHintLabel="&apos;"
-        latin:additionalMoreKeys="&apos;" />
+        latin:additionalMoreKeys="!text/more_keys_for_cyrillic_apostroph" />
     <!-- U+043C: "м" CYRILLIC SMALL LETTER EM -->
     <Key
         latin:keyLabel="&#x043C;"
diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
index 535362e6b..3167a2eb7 100644
--- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
+++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java
@@ -250,6 +250,7 @@ public final class KeyboardTextsSet {
         /* 145 */ "more_keys_for_single_quote",
         /* 146 */ "more_keys_for_double_quote",
         /* 147 */ "more_keys_for_tablet_double_quote",
+        /* 148 */ "more_keys_for_cyrillic_apostroph",
     };
 
     private static final String EMPTY = "";
@@ -442,6 +443,8 @@ public final class KeyboardTextsSet {
         /* 145 */ "!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes",
         /* 146 */ "!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes",
         /* 147 */ "!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes",
+        // U+0027: "'" APOSTROPH
+        /* 148 */ "'",
     };
 
     /* Language af: Afrikaans */
@@ -2921,11 +2924,8 @@ public final class KeyboardTextsSet {
         /* 32 */ "\u0491",
         // U+0457: "ї" CYRILLIC SMALL LETTER YI
         /* 33 */ "\u0457",
-        /* 34 */ null,
-        // U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN
-        /* 35 */ "\u044A",
-        /* 36~ */
-        null, null, null, null, null, null,
+        /* 34~ */
+        null, null, null, null, null, null, null, null,
         /* ~41 */
         // Label for "switch to alphabetic" key.
         // U+0410: "А" CYRILLIC CAPITAL LETTER A
@@ -2939,6 +2939,18 @@ public final class KeyboardTextsSet {
         /* ~47 */
         // U+20B4: "₴" HRYVNIA SIGN
         /* 48 */ "\u20B4",
+        /* 49~ */
+        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+        null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,
+        null, null, null, null, null, null, null, null, null,
+        /* ~147 */
+        // U+0027: "'" APOSTROPH
+        // U+02BC: "ʼ" CYRILLIC APOSTROPH
+        /* 148 */ "',\u02BC",
     };
 
     /* Language vi: Vietnamese */
diff --git a/tools/maketext/res/values-uk/donottranslate-more-keys.xml b/tools/maketext/res/values-uk/donottranslate-more-keys.xml
index cc05cc697..02b635ba9 100644
--- a/tools/maketext/res/values-uk/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values-uk/donottranslate-more-keys.xml
@@ -32,8 +32,9 @@
     <string name="more_keys_for_cyrillic_ghe">&#x0491;</string>
     <!-- U+0457: "ї" CYRILLIC SMALL LETTER YI -->
     <string name="more_keys_for_east_slavic_row2_1">&#x0457;</string>
-    <!-- U+044A: "ъ" CYRILLIC SMALL LETTER HARD SIGN -->
-    <string name="more_keys_for_cyrillic_soft_sign">&#x044A;</string>
+    <!-- U+0027: "'" APOSTROPH
+         U+02BC: "ʼ" CYRILLIC APOSTROPH -->
+    <string name="more_keys_for_cyrillic_apostroph">&apos;,&#x02BC;</string>
     <!-- U+20B4: "₴" HRYVNIA SIGN -->
     <string name="keylabel_for_currency_generic">&#x20B4;</string>
     <!-- Label for "switch to alphabetic" key.
diff --git a/tools/maketext/res/values/donottranslate-more-keys.xml b/tools/maketext/res/values/donottranslate-more-keys.xml
index 44757305c..7851b6e43 100644
--- a/tools/maketext/res/values/donottranslate-more-keys.xml
+++ b/tools/maketext/res/values/donottranslate-more-keys.xml
@@ -247,4 +247,6 @@
     <string name="more_keys_for_single_quote">!fixedColumnOrder!5,!text/single_quotes,!text/single_angle_quotes</string>
     <string name="more_keys_for_double_quote">!fixedColumnOrder!5,!text/double_quotes,!text/double_angle_quotes</string>
     <string name="more_keys_for_tablet_double_quote">!fixedColumnOrder!6,!text/double_quotes,!text/single_quotes,!text/double_angle_quotes,!text/single_angle_quotes</string>
+    <!-- U+0027: "'" APOSTROPH -->
+    <string name="more_keys_for_cyrillic_apostroph">&apos;</string>
 </resources>