Merge "Suppress flickers of the auto correction indicator" into ics-mr0
diff --git a/java/res/values-ar/donottranslate-more-keys.xml b/java/res/values-ar/donottranslate-more-keys.xml
index c63a957..2596be0 100644
--- a/java/res/values-ar/donottranslate-more-keys.xml
+++ b/java/res/values-ar/donottranslate-more-keys.xml
@@ -75,4 +75,5 @@
<string name="more_keys_for_apostrophe">"\u061f,\u061b,!,:,-,/,\',\""</string>
<string name="more_keys_for_dash">"\u0651,\u0652,\u064c,\u0640,\u064f,\u064e,\u0650,\u064b,\u064d"</string>
<string name="more_keys_for_bullet">♪</string>
+ <string name="more_keys_for_star">★</string>
</resources>
diff --git a/java/res/values-iw/donottranslate-more-keys.xml b/java/res/values-iw/donottranslate-more-keys.xml
new file mode 100644
index 0000000..829486f
--- /dev/null
+++ b/java/res/values-iw/donottranslate-more-keys.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2011, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="more_keys_for_star">★</string>
+ <string name="more_keys_for_plus">±,﬩</string>
+</resources>
diff --git a/java/res/values/donottranslate-more-keys.xml b/java/res/values/donottranslate-more-keys.xml
index b610412..6322adc 100644
--- a/java/res/values/donottranslate-more-keys.xml
+++ b/java/res/values/donottranslate-more-keys.xml
@@ -97,4 +97,6 @@
<string name="more_keys_for_apostrophe">\"</string>
<string name="more_keys_for_dash">_</string>
<string name="more_keys_for_bullet">♪,♥,♠,♦,♣</string>
+ <string name="more_keys_for_star">†,‡,★</string>
+ <string name="more_keys_for_plus">±</string>
</resources>
diff --git a/java/res/xml-sw600dp/kbd_rows_symbols.xml b/java/res/xml-sw600dp/kbd_rows_symbols.xml
index d3513c9..bb48fe7 100644
--- a/java/res/xml-sw600dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw600dp/kbd_rows_symbols.xml
@@ -78,13 +78,13 @@
latin:keyLabel="&" />
<Key
latin:keyLabel="*"
- latin:moreKeys="†,‡,★" />
+ latin:moreKeys="@string/more_keys_for_star" />
<Key
latin:keyLabel="-"
latin:moreKeys="_,–,—" />
<Key
latin:keyLabel="+"
- latin:moreKeys="±" />
+ latin:moreKeys="@string/more_keys_for_plus" />
<Key
latin:keyLabel="("
latin:moreKeys="[,{,<" />
diff --git a/java/res/xml-sw768dp/kbd_rows_symbols.xml b/java/res/xml-sw768dp/kbd_rows_symbols.xml
index fd18a2a..987b10c 100644
--- a/java/res/xml-sw768dp/kbd_rows_symbols.xml
+++ b/java/res/xml-sw768dp/kbd_rows_symbols.xml
@@ -85,13 +85,13 @@
latin:keyLabel="&" />
<Key
latin:keyLabel="*"
- latin:moreKeys="†,‡,★" />
+ latin:moreKeys="@string/more_keys_for_star" />
<Key
latin:keyLabel="-"
latin:moreKeys="_,–,—" />
<Key
latin:keyLabel="+"
- latin:moreKeys="±" />
+ latin:moreKeys="@string/more_keys_for_plus" />
<Key
latin:keyLabel="("
latin:moreKeys="[,{,<" />
diff --git a/java/res/xml/kbd_rows_arabic.xml b/java/res/xml/kbd_rows_arabic.xml
index 3051386..fba7271 100644
--- a/java/res/xml/kbd_rows_arabic.xml
+++ b/java/res/xml/kbd_rows_arabic.xml
@@ -52,11 +52,11 @@
latin:keyHintLabel="٦"
latin:moreKeys="٦,6" />
<!-- \ufeeb: ARABIC LETTER HEH INITIAL FORM
- \u0647\u0640: ARABIC LETTER HEH + ARABIC TATWEEL -->
+ \u0647\u0640: ARABIC LETTER HEH + Zero width joiner -->
<Key
latin:keyLabel="ه"
latin:keyHintLabel="٧"
- latin:moreKeys="٧,7,\ufeeb|\u0647\u0640" />
+ latin:moreKeys="٧,7,\ufeeb|\u0647\u200D" />
<Key
latin:keyLabel="خ"
latin:keyHintLabel="٨"
diff --git a/java/res/xml/kbd_rows_symbols.xml b/java/res/xml/kbd_rows_symbols.xml
index 2235f4d..074db50 100644
--- a/java/res/xml/kbd_rows_symbols.xml
+++ b/java/res/xml/kbd_rows_symbols.xml
@@ -76,13 +76,13 @@
latin:keyLabel="&" />
<Key
latin:keyLabel="*"
- latin:moreKeys="†,‡,★" />
+ latin:moreKeys="@string/more_keys_for_star" />
<Key
latin:keyLabel="-"
latin:moreKeys="_,–,—" />
<Key
latin:keyLabel="+"
- latin:moreKeys="±" />
+ latin:moreKeys="@string/more_keys_for_plus" />
<Key
latin:keyLabel="("
latin:moreKeys="[,{,<" />