diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/layout/input_view.xml | 2 | ||||
| -rw-r--r-- | java/res/layout/suggestions_strip.xml | 3 | ||||
| -rw-r--r-- | java/res/values-ta-rIN/strings-talkback-descriptions.xml | 2 | ||||
| -rw-r--r-- | java/res/values/donottranslate.xml | 6 | ||||
| -rw-r--r-- | java/res/values/strings.xml | 7 | ||||
| -rw-r--r-- | java/res/xml/key_styles_currency.xml | 1 | ||||
| -rw-r--r-- | java/res/xml/method.xml | 11 |
7 files changed, 29 insertions, 3 deletions
diff --git a/java/res/layout/input_view.xml b/java/res/layout/input_view.xml index 7bfda3ae2..a4bcdcc8a 100644 --- a/java/res/layout/input_view.xml +++ b/java/res/layout/input_view.xml @@ -25,7 +25,7 @@ android:gravity="bottom|center_horizontal" android:orientation="vertical" > <!-- The height of key_preview_backing view will automatically be determined by code. --> - <RelativeLayout + <FrameLayout android:id="@+id/key_preview_backing" android:layout_width="match_parent" android:layout_height="0dp" /> diff --git a/java/res/layout/suggestions_strip.xml b/java/res/layout/suggestions_strip.xml index 489477990..aefdb8cad 100644 --- a/java/res/layout/suggestions_strip.xml +++ b/java/res/layout/suggestions_strip.xml @@ -48,12 +48,13 @@ android:layout_height="match_parent" style="?attr/suggestionWordStyle" /> <include + android:id="@+id/word_to_save_divider" layout="@layout/suggestion_divider" /> <TextView android:id="@+id/hint_add_to_dictionary" android:layout_width="match_parent" android:layout_height="match_parent" - android:textAlignment="viewStart" + android:gravity="center_vertical|start" style="?attr/suggestionWordStyle" /> </LinearLayout> <!-- Provide audio and haptic feedback by ourselves based on the keyboard settings. diff --git a/java/res/values-ta-rIN/strings-talkback-descriptions.xml b/java/res/values-ta-rIN/strings-talkback-descriptions.xml index a65c8de21..911e1a596 100644 --- a/java/res/values-ta-rIN/strings-talkback-descriptions.xml +++ b/java/res/values-ta-rIN/strings-talkback-descriptions.xml @@ -35,7 +35,7 @@ <string name="spoken_description_to_symbol" msgid="8244903740201126590">"சின்னங்கள்"</string> <string name="spoken_description_to_alpha" msgid="4081215210530031950">"எழுத்துகள்"</string> <string name="spoken_description_to_numeric" msgid="4560261331530795682">"எண்கள்"</string> - <string name="spoken_description_settings" msgid="7281251004003143204">"அமைப்புகள்"</string> + <string name="spoken_description_settings" msgid="7281251004003143204">"அமைப்பு"</string> <string name="spoken_description_tab" msgid="8210782459446866716">"டேப்"</string> <string name="spoken_description_space" msgid="5908716896642059145">"ஸ்பேஸ்"</string> <string name="spoken_description_mic" msgid="6153138783813452464">"குரல் உள்ளீடு"</string> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index b25a20803..d4d638542 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -37,6 +37,12 @@ <item>en_US</item> <item>en_GB</item> <item>es_US</item> + <item>hi_ZZ</item> + </string-array> + + <!-- Subtype locale whose name should be displayed in Locale.ROOT. --> + <string-array name="subtype_locale_displayed_in_root_locale"> + <item>hi_ZZ</item> </string-array> <!-- Generic subtype label --> diff --git a/java/res/values/strings.xml b/java/res/values/strings.xml index cb03260ed..2a6495a57 100644 --- a/java/res/values/strings.xml +++ b/java/res/values/strings.xml @@ -168,6 +168,8 @@ <!-- Add to dictionary hint --> <string name="hint_add_to_dictionary">Touch again to save</string> + <!-- Add to dictionary hint --> + <string name="hint_add_to_dictionary_without_word">Touch here to save</string> <!-- Inform the user that a particular language has an available dictionary --> <string name="has_dictionary">Dictionary available</string> @@ -184,6 +186,8 @@ <!-- Description for Spanish (US) keyboard subtype [CHAR LIMIT=25] (US) should be an abbreviation of United States to fit in the CHAR LIMIT. --> <string name="subtype_es_US">Spanish (US)</string> + <!-- Description for Hinglish (https://en.wikipedia.org/wiki/Hinglish) keyboard subtype [CHAR LIMIT=25] --> + <string name="subtype_hi_ZZ">Hinglish</string> <!-- Description for English (UK) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] (UK) should be an abbreviation of United Kingdom to fit in the CHAR LIMIT. This should be identical to subtype_en_GB aside from the trailing (%s). --> @@ -196,6 +200,9 @@ (US) should be an abbreviation of United Statesn to fit in the CHAR LIMIT. This should be identical to subtype_es_US aside from the trailing (%s). --> <string name="subtype_with_layout_es_US">Spanish (US) (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> + <!-- Description for Hinglish (https://en.wikipedia.org/wiki/Hinglish) keyboard subtype with explicit keyboard layout [CHAR LIMIT=25] + This should be identical to subtype_hi_ZZ aside from the trailing (%s). --> + <string name="subtype_with_layout_hi_ZZ">Hinglish (<xliff:g id="KEYBOARD_LAYOUT" example="QWERTY">%s</xliff:g>)</string> <!-- Description for "LANGUAGE_NAME" (Traditional) keyboard subtype [CHAR LIMIT=25] (Traditional) can be an abbreviation to fit in the CHAR LIMIT. --> <string name="subtype_generic_traditional"><xliff:g id="LANGUAGE_NAME" example="Nepali">%s</xliff:g> (Traditional)</string> diff --git a/java/res/xml/key_styles_currency.xml b/java/res/xml/key_styles_currency.xml index cfe9a90a1..2ce6318f3 100644 --- a/java/res/xml/key_styles_currency.xml +++ b/java/res/xml/key_styles_currency.xml @@ -80,6 +80,7 @@ </case> <!-- fa: Persian (Rial and Afgahni) hi: Hindi (Indian Rupee) + hi_ZZ: Hinglish (Indian Rupee) iw: Hebrew (New Sheqel) lo: Lao (Kip) mn: Mongolian (Tugrik) diff --git a/java/res/xml/method.xml b/java/res/xml/method.xml index d71e88b8f..74ac79f59 100644 --- a/java/res/xml/method.xml +++ b/java/res/xml/method.xml @@ -52,6 +52,7 @@ gl_ES: Galician (Spain)/spanish hi: Hindi/hindi hi: Hindi/hindi_compact + (hi_ZZ: Hinglish/qwerty) # This is a preliminary keyboard layout. hr: Croatian/qwertz hu: Hungarian/qwertz hy_AM: Armenian (Armenia) Phonetic/armenian_phonetic @@ -354,6 +355,16 @@ android:imeSubtypeExtraValue="KeyboardLayoutSet=hindi_compact,EmojiCapable" android:isAsciiCapable="false" /> + <!-- TODO: This Hinglish keyboard is a preliminary layout. + This isn't based on the final specification. --> + <subtype android:icon="@drawable/ic_ime_switcher_dark" + android:label="@string/subtype_hi_ZZ" + android:subtypeId="0x352eb37c" + android:imeSubtypeLocale="hi_ZZ" + android:imeSubtypeMode="keyboard" + android:imeSubtypeExtraValue="AsciiCapable,KeyboardLayoutSet=qwerty,EmojiCapable" + android:isAsciiCapable="true" + /> <subtype android:icon="@drawable/ic_ime_switcher_dark" android:label="@string/subtype_generic" android:subtypeId="0x35b7526a" |