Merge "Refactor: Move utility functions and no suggestion functions from unigram_dictionary.cpp to dictionary.cpp"
diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml
index 17b6d87..bd17bd2 100644
--- a/java/res/values/strings.xml
+++ b/java/res/values/strings.xml
@@ -218,9 +218,9 @@
<string name="label_done_key">Done</string>
<!-- Label for soft enter key when it performs SEND action. Must be short to fit on key! -->
<string name="label_send_key">Send</string>
- <!-- Label for "switch to symbols" key. Must be short to fit on key! -->
+ <!-- Label for "switch to symbols" key. Must be short to fit on key! [CHAR LIMIT=4] -->
<string name="label_to_symbol_key">\?123</string>
- <!-- Label for "switch to numeric" key. Must be short to fit on key! -->
+ <!-- Label for "switch to numeric" key. Must be short to fit on key! [CHAR LIMIT=4] -->
<string name="label_phone_key">123</string>
<!-- Label for "switch to alphabetic" key. Must be short to fit on key! -->
<string name="label_to_alpha_key">ABC</string>
diff --git a/java/res/xml-xlarge/kbd_symbols.xml b/java/res/xml-xlarge/kbd_symbols.xml
index 85deb87..a5e169d 100644
--- a/java/res/xml-xlarge/kbd_symbols.xml
+++ b/java/res/xml-xlarge/kbd_symbols.xml
@@ -139,7 +139,9 @@
<Key
latin:keyLabel="]" />
<Key
- latin:keyLabel="=" />
+ latin:keyLabel="="
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="≠≈" />
<Key
latin:keyLabel=":" />
<Key
diff --git a/java/res/xml-xlarge/kbd_symbols_shift.xml b/java/res/xml-xlarge/kbd_symbols_shift.xml
index 5620e1d..6edfbc7 100644
--- a/java/res/xml-xlarge/kbd_symbols_shift.xml
+++ b/java/res/xml-xlarge/kbd_symbols_shift.xml
@@ -85,11 +85,13 @@
latin:popupKeyboard="@xml/kbd_popup_template"
latin:popupCharacters="↑↓←→" />
<Key
- latin:keyLabel="∞"
+ latin:keyLabel="°"
latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="≠≈" />
+ latin:popupCharacters="¶§" />
<Key
- latin:keyLabel="±" />
+ latin:keyLabel="±"
+ latin:popupKeyboard="@xml/kbd_popup_template"
+ latin:popupCharacters="∞" />
<Key
latin:keyLabel="[" />
<Key
@@ -107,6 +109,8 @@
latin:keyWidth="15.192%p"
latin:keyEdgeFlags="left" />
<Key
+ latin:keyLabel="\\" />
+ <Key
latin:keyLabel="©" />
<Key
latin:keyLabel="®"
@@ -117,10 +121,6 @@
<Key
latin:keyLabel="}" />
<Key
- latin:keyLabel="°"
- latin:popupKeyboard="@xml/kbd_popup_template"
- latin:popupCharacters="¶§" />
- <Key
latin:keyLabel="," />
<Key
latin:keyLabel="." />