diff options
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/layout/emoji_palettes_view.xml | 4 | ||||
| -rw-r--r-- | java/res/values-hy/donottranslate.xml | 3 | ||||
| -rw-r--r-- | java/res/values/attrs.xml | 1 | ||||
| -rw-r--r-- | java/res/values/donottranslate.xml | 3 | ||||
| -rw-r--r-- | java/res/xml/key_styles_enter.xml | 106 |
5 files changed, 94 insertions, 23 deletions
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml index 613332675..1c6da90ba 100644 --- a/java/res/layout/emoji_palettes_view.xml +++ b/java/res/layout/emoji_palettes_view.xml @@ -101,10 +101,10 @@ android:layout_weight="0.70" android:layout_height="match_parent" /> <ImageButton - android:id="@+id/emoji_keyboard_send" + android:id="@+id/emoji_keyboard_alphabet2" android:layout_width="0dip" android:layout_weight="0.15" android:layout_height="match_parent" - android:src="@drawable/sym_keyboard_return_holo_dark" /> + android:src="@drawable/ic_ime_switcher_dark" /> </LinearLayout> </com.android.inputmethod.keyboard.EmojiPalettesView> diff --git a/java/res/values-hy/donottranslate.xml b/java/res/values-hy/donottranslate.xml index 4a6d188fb..7b0c56655 100644 --- a/java/res/values-hy/donottranslate.xml +++ b/java/res/values-hy/donottranslate.xml @@ -26,4 +26,7 @@ <!-- Symbols that separate words. Adding armenian period and comma. --> <!-- Don't remove the enclosing double quotes, they protect whitespace (not just U+0020) --> <string name="symbols_word_separators">"	 \n"()[]{}*&<>+=|.,;:!?/_\"։՝</string> + <!-- The sentence separator code point, for capitalization --> + <!-- U+0589: "։" ARMENIAN FULL STOP ; 589h = 1417d --> + <integer name="sentence_separator">1417</integer> </resources> diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml index e5fe56448..31945d020 100644 --- a/java/res/values/attrs.xml +++ b/java/res/values/attrs.xml @@ -413,7 +413,6 @@ </attr> <attr name="navigateNext" format="boolean" /> <attr name="navigatePrevious" format="boolean" /> - <attr name="navigateEmoji" format="boolean" /> <attr name="passwordInput" format="boolean" /> <attr name="clobberSettingsKey" format="boolean" /> <attr name="shortcutKeyEnabled" format="boolean" /> diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 42e692d2f..4733aa257 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -31,6 +31,9 @@ <string name="symbols_word_separators">"	 \n"()[]{}*&<>+=|.,;:!?/_\"</string> <!-- Word connectors --> <string name="symbols_word_connectors">\'-</string> + <!-- The sentence separator code point, for capitalization --> + <!-- U+002E: "." FULL STOP ; 2Eh = 46d --> + <integer name="sentence_separator">46</integer> <!-- Whether this language uses spaces between words --> <bool name="current_language_has_spaces">true</bool> diff --git a/java/res/xml/key_styles_enter.xml b/java/res/xml/key_styles_enter.xml index 68c0a2350..568c60270 100644 --- a/java/res/xml/key_styles_enter.xml +++ b/java/res/xml/key_styles_enter.xml @@ -21,13 +21,14 @@ <merge xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin" > + <!-- TODO: Stop using many conditional cases for emoji_key_as_more_key. There are way too many to maintain. --> <!-- Navigate more keys style --> <switch> - <!-- navigateEmoji="false" --> + <!-- latin:passwordInput="true" --> <case latin:imeAction="actionNext" latin:navigatePrevious="true" - latin:navigateEmoji="false" + latin:passwordInput="true" > <key-style latin:styleName="navigateMoreKeysStyle" @@ -37,7 +38,7 @@ <case latin:imeAction="actionNext" latin:navigatePrevious="false" - latin:navigateEmoji="false" + latin:passwordInput="true" > <key-style latin:styleName="navigateMoreKeysStyle" /> @@ -45,7 +46,7 @@ <case latin:imeAction="actionPrevious" latin:navigateNext="true" - latin:navigateEmoji="false" + latin:passwordInput="true" > <key-style latin:styleName="navigateMoreKeysStyle" @@ -55,16 +56,15 @@ <case latin:imeAction="actionPrevious" latin:navigateNext="false" - latin:navigateEmoji="false" + latin:passwordInput="true" > <key-style latin:styleName="navigateMoreKeysStyle" /> </case> - <!-- imeAction!="actionNext" and imeAction!="actionPrevious" --> <case latin:navigateNext="true" latin:navigatePrevious="true" - latin:navigateEmoji="false" + latin:passwordInput="true" > <key-style latin:styleName="navigateMoreKeysStyle" @@ -74,7 +74,7 @@ <case latin:navigateNext="true" latin:navigatePrevious="false" - latin:navigateEmoji="false" + latin:passwordInput="true" > <key-style latin:styleName="navigateMoreKeysStyle" @@ -84,7 +84,7 @@ <case latin:navigateNext="false" latin:navigatePrevious="true" - latin:navigateEmoji="false" + latin:passwordInput="true" > <key-style latin:styleName="navigateMoreKeysStyle" @@ -94,16 +94,90 @@ <case latin:navigateNext="false" latin:navigatePrevious="false" - latin:navigateEmoji="false" + latin:passwordInput="true" > <key-style latin:styleName="navigateMoreKeysStyle" /> </case> - <!-- navigateEmoji="true" --> + <!-- latin:mode="email|url|phone|number|date|time|datetime" --> + <case + latin:imeAction="actionNext" + latin:navigatePrevious="true" + latin:mode="email|url|phone|number|date|time|datetime" + > + <key-style + latin:styleName="navigateMoreKeysStyle" + latin:keyLabelFlags="hasPopupHint|preserveCase" + latin:moreKeys="!text/action_previous_as_more_key" /> + </case> + <case + latin:imeAction="actionNext" + latin:navigatePrevious="false" + latin:mode="email|url|phone|number|date|time|datetime" + > + <key-style + latin:styleName="navigateMoreKeysStyle" /> + </case> + <case + latin:imeAction="actionPrevious" + latin:navigateNext="true" + latin:mode="email|url|phone|number|date|time|datetime" + > + <key-style + latin:styleName="navigateMoreKeysStyle" + latin:keyLabelFlags="hasPopupHint|preserveCase" + latin:moreKeys="!text/action_next_as_more_key" /> + </case> + <case + latin:imeAction="actionPrevious" + latin:navigateNext="false" + latin:mode="email|url|phone|number|date|time|datetime" + > + <key-style + latin:styleName="navigateMoreKeysStyle" /> + </case> + <case + latin:navigateNext="true" + latin:navigatePrevious="true" + latin:mode="email|url|phone|number|date|time|datetime" + > + <key-style + latin:styleName="navigateMoreKeysStyle" + latin:keyLabelFlags="hasPopupHint|preserveCase" + latin:moreKeys="!fixedColumnOrder!2,!needsDividers!,!text/action_previous_as_more_key,!text/action_next_as_more_key" /> + </case> + <case + latin:navigateNext="true" + latin:navigatePrevious="false" + latin:mode="email|url|phone|number|date|time|datetime" + > + <key-style + latin:styleName="navigateMoreKeysStyle" + latin:keyLabelFlags="hasPopupHint|preserveCase" + latin:moreKeys="!text/action_next_as_more_key" /> + </case> + <case + latin:navigateNext="false" + latin:navigatePrevious="true" + latin:mode="email|url|phone|number|date|time|datetime" + > + <key-style + latin:styleName="navigateMoreKeysStyle" + latin:keyLabelFlags="hasPopupHint|preserveCase" + latin:moreKeys="!text/action_previous_as_more_key" /> + </case> + <case + latin:navigateNext="false" + latin:navigatePrevious="false" + latin:mode="email|url|phone|number|date|time|datetime" + > + <key-style + latin:styleName="navigateMoreKeysStyle" /> + </case> + <!-- default --> <case latin:imeAction="actionNext" latin:navigatePrevious="true" - latin:navigateEmoji="true" > <key-style latin:styleName="navigateMoreKeysStyle" @@ -113,7 +187,6 @@ <case latin:imeAction="actionNext" latin:navigatePrevious="false" - latin:navigateEmoji="true" > <key-style latin:styleName="navigateMoreKeysStyle" @@ -122,7 +195,6 @@ <case latin:imeAction="actionPrevious" latin:navigateNext="true" - latin:navigateEmoji="true" > <key-style latin:styleName="navigateMoreKeysStyle" @@ -132,17 +204,14 @@ <case latin:imeAction="actionPrevious" latin:navigateNext="false" - latin:navigateEmoji="true" > <key-style latin:styleName="navigateMoreKeysStyle" latin:moreKeys="!text/emoji_key_as_more_key" /> </case> - <!-- imeAction!="actionNext" and imeAction!="actionPrevious" --> <case latin:navigateNext="true" latin:navigatePrevious="true" - latin:navigateEmoji="true" > <key-style latin:styleName="navigateMoreKeysStyle" @@ -152,7 +221,6 @@ <case latin:navigateNext="true" latin:navigatePrevious="false" - latin:navigateEmoji="true" > <key-style latin:styleName="navigateMoreKeysStyle" @@ -162,7 +230,6 @@ <case latin:navigateNext="false" latin:navigatePrevious="true" - latin:navigateEmoji="true" > <key-style latin:styleName="navigateMoreKeysStyle" @@ -172,7 +239,6 @@ <case latin:navigateNext="false" latin:navigatePrevious="false" - latin:navigateEmoji="true" > <key-style latin:styleName="navigateMoreKeysStyle" |