diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 7d6021ba19a2ba6dae10e0020f2f2a5b7eb9cd25..0d18d907d1e69e0b7626c23205b0695a7381d437 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -32,8 +32,11 @@ magic_space_swapping_symbols | magic_space_stripping_symbols | magic_space_neutral_symbols \ non_word_separator_symbols --> - <!-- Label for ALT modifier key. Must be short to fit on key! --> - <string name="label_alt_key">ALT</string> + <!-- Label for "switch to more symbol" modifier key. Must be short to fit on key! --> + <string name="label_to_more_symbol_key">= \\ <</string> + <!-- Label for "switch to more symbol" modifier key on tablets. Must be short to fit on key! --> + <string name="label_to_more_symbol_for_tablet_key">\\ ^ [ {</string> + <!-- Label for "Tab" key. Must be short to fit on key! --> <string name="label_tab_key">Tab</string> <!-- Label for "switch to phone numeric" key. Must be short to fit on key! --> diff --git a/java/res/xml-sw600dp/kbd_key_styles.xml b/java/res/xml-sw600dp/kbd_key_styles.xml index b679368a2c33a39e812e592677e5060e4355016a..aff75d69a2d36538841efcd973c83fbdebbcafc0 100644 --- a/java/res/xml-sw600dp/kbd_key_styles.xml +++ b/java/res/xml-sw600dp/kbd_key_styles.xml @@ -105,12 +105,17 @@ latin:keyLabelOption="fontNormal" latin:parentStyle="functionalKeyStyle" /> <key-style - latin:styleName="moreKeyStyle" + latin:styleName="toMoreSymbolKeyStyle" latin:code="@integer/key_shift" - latin:keyLabel="@string/label_more_key" + latin:keyLabel="@string/label_to_more_symbol_for_tablet_key" latin:keyLabelOption="fontNormal" - latin:parentStyle="functionalKeyStyle" - latin:isSticky="true" /> + latin:parentStyle="functionalKeyStyle" /> + <key-style + latin:styleName="backFromMoreSymbolKeyStyle" + latin:code="@integer/key_shift" + latin:keyLabel="@string/label_to_symbol_key" + latin:keyLabelOption="fontNormal" + latin:parentStyle="functionalKeyStyle" /> <key-style latin:styleName="comKeyStyle" latin:keyLabel="@string/keylabel_for_popular_domain" diff --git a/java/res/xml-sw600dp/kbd_phone.xml b/java/res/xml-sw600dp/kbd_phone.xml index 7b584c142c176196ae321ff3f8dceb730c759b65..0331389c15ba79c4e5189d086e9127271b1ef56a 100644 --- a/java/res/xml-sw600dp/kbd_phone.xml +++ b/java/res/xml-sw600dp/kbd_phone.xml @@ -76,7 +76,7 @@ </Row> <Row> <Key - latin:keyStyle="moreKeyStyle" + latin:keyStyle="toMoreSymbolKeyStyle" latin:keyWidth="11.0%p" /> <Key latin:keyLabel="(" diff --git a/java/res/xml-sw600dp/kbd_phone_shift.xml b/java/res/xml-sw600dp/kbd_phone_shift.xml index 483964526737b188d23ce2860f608554fed67e68..2b6936dce42d4727d76be8215eb25e9a08f16ebd 100644 --- a/java/res/xml-sw600dp/kbd_phone_shift.xml +++ b/java/res/xml-sw600dp/kbd_phone_shift.xml @@ -84,7 +84,7 @@ </Row> <Row> <Key - latin:keyStyle="moreKeyStyle" + latin:keyStyle="backFromMoreSymbolKeyStyle" latin:keyWidth="11.00%p" /> <Key latin:keyLabel="(" diff --git a/java/res/xml-sw600dp/kbd_rows_symbols.xml b/java/res/xml-sw600dp/kbd_rows_symbols.xml index 058c97efd87d93a81fbdca93d5d963f91f9f3a9a..4f6a9bc3138ba8fd115ba7a23909968cc4059019 100644 --- a/java/res/xml-sw600dp/kbd_rows_symbols.xml +++ b/java/res/xml-sw600dp/kbd_rows_symbols.xml @@ -100,7 +100,7 @@ latin:keyWidth="8.9%p" > <Key - latin:keyStyle="moreKeyStyle" + latin:keyStyle="toMoreSymbolKeyStyle" latin:keyWidth="10.0%p" /> <Key latin:keyLabel="<" diff --git a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml index ac4b93fa47af19fb417d486109666dfcca3cc1d1..1dca8c47eeedc3f2f0555a652fa84abb87639e0a 100644 --- a/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml +++ b/java/res/xml-sw600dp/kbd_rows_symbols_shift.xml @@ -101,7 +101,7 @@ latin:keyWidth="8.9%p" > <Key - latin:keyStyle="moreKeyStyle" + latin:keyStyle="backFromMoreSymbolKeyStyle" latin:keyWidth="10.0%p" /> <Key latin:keyLabel="\\" /> diff --git a/java/res/xml-sw768dp/kbd_key_styles.xml b/java/res/xml-sw768dp/kbd_key_styles.xml index 6e4818dc2d14f363226facb839d89fb7e483a262..1711c423f72cf2cbaf80338c0702c8ca5658e725 100644 --- a/java/res/xml-sw768dp/kbd_key_styles.xml +++ b/java/res/xml-sw768dp/kbd_key_styles.xml @@ -87,12 +87,17 @@ latin:keyLabelOption="fontNormal" latin:parentStyle="functionalKeyStyle" /> <key-style - latin:styleName="moreKeyStyle" + latin:styleName="toMoreSymbolKeyStyle" latin:code="@integer/key_shift" - latin:keyLabel="@string/label_more_key" + latin:keyLabel="@string/label_to_more_symbol_for_tablet_key" latin:keyLabelOption="fontNormal" - latin:parentStyle="functionalKeyStyle" - latin:isSticky="true" /> + latin:parentStyle="functionalKeyStyle" /> + <key-style + latin:styleName="backFromMoreSymbolKeyStyle" + latin:code="@integer/key_shift" + latin:keyLabel="@string/label_to_symbol_key" + latin:keyLabelOption="fontNormal" + latin:parentStyle="functionalKeyStyle" /> <key-style latin:styleName="comKeyStyle" latin:keyLabel="@string/keylabel_for_popular_domain" diff --git a/java/res/xml-sw768dp/kbd_phone.xml b/java/res/xml-sw768dp/kbd_phone.xml index cf6790f79a9ca62fd30393216aaec68b5a4e4bfd..e55b1841ad3b3fa8c89046df5c86fafe3a796d8f 100644 --- a/java/res/xml-sw768dp/kbd_phone.xml +++ b/java/res/xml-sw768dp/kbd_phone.xml @@ -54,7 +54,7 @@ </Row> <Row> <Key - latin:keyStyle="moreKeyStyle" + latin:keyStyle="toMoreSymbolKeyStyle" latin:keyWidth="11.172%p" /> <Key latin:keyLabel="," diff --git a/java/res/xml-sw768dp/kbd_phone_shift.xml b/java/res/xml-sw768dp/kbd_phone_shift.xml index 7f62716282e2c6270026f0a744ea8bf2e7e515f6..646f0b86719c692065bc2df1e8f52235213485a8 100644 --- a/java/res/xml-sw768dp/kbd_phone_shift.xml +++ b/java/res/xml-sw768dp/kbd_phone_shift.xml @@ -58,7 +58,7 @@ </Row> <Row> <Key - latin:keyStyle="moreKeyStyle" + latin:keyStyle="backFromMoreSymbolKeyStyle" latin:keyWidth="11.172%p" /> <Key latin:keyLabel="," diff --git a/java/res/xml-sw768dp/kbd_rows_symbols.xml b/java/res/xml-sw768dp/kbd_rows_symbols.xml index 2a01fe2989782e0f775e6becd1a01757b158368b..66b9789ac3ec0de0141a34c31d7caed383faf41d 100644 --- a/java/res/xml-sw768dp/kbd_rows_symbols.xml +++ b/java/res/xml-sw768dp/kbd_rows_symbols.xml @@ -107,7 +107,7 @@ latin:keyWidth="8.047%p" > <Key - latin:keyStyle="moreKeyStyle" + latin:keyStyle="toMoreSymbolKeyStyle" latin:keyWidth="13.829%p" /> <Key latin:keyLabel="<" @@ -146,7 +146,7 @@ latin:keyLabel="@string/keylabel_for_symbols_question" latin:popupCharacters="@string/alternates_for_symbols_question" /> <Key - latin:keyStyle="moreKeyStyle" + latin:keyStyle="toMoreSymbolKeyStyle" latin:keyXPos="-13.750%p" latin:keyWidth="fillBoth" /> </Row> diff --git a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml b/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml index 5c120827fcb9cd794f2eadd5d8e9e37192f17e43..1f43a0f919da94964d32ad28c85074a1f4cc0876 100644 --- a/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml +++ b/java/res/xml-sw768dp/kbd_rows_symbols_shift.xml @@ -108,7 +108,7 @@ latin:keyWidth="8.047%p" > <Key - latin:keyStyle="moreKeyStyle" + latin:keyStyle="backFromMoreSymbolKeyStyle" latin:keyWidth="13.829%p" /> <Key latin:keyLabel="\\" /> @@ -135,7 +135,7 @@ latin:keyStyle="nonPasswordSymbolKeyStyle" latin:keyLabel="¿" /> <Key - latin:keyStyle="moreKeyStyle" + latin:keyStyle="backFromMoreSymbolKeyStyle" latin:keyXPos="-13.750%p" latin:keyWidth="fillBoth" /> </Row> diff --git a/java/res/xml/kbd_key_styles.xml b/java/res/xml/kbd_key_styles.xml index 5c4bf52b48769fc61c04ca9b1adac16d8a913255..af6d9dce3a2c24474f4ee1b9b5df2bd6f8e369b6 100644 --- a/java/res/xml/kbd_key_styles.xml +++ b/java/res/xml/kbd_key_styles.xml @@ -204,11 +204,15 @@ latin:keyLabel="@string/label_to_alpha_key" latin:parentStyle="functionalKeyStyle" /> <key-style - latin:styleName="altKeyStyle" + latin:styleName="toMoreSymbolKeyStyle" latin:code="@integer/key_shift" - latin:keyLabel="@string/label_alt_key" - latin:parentStyle="functionalKeyStyle" - latin:isSticky="true" /> + latin:keyLabel="@string/label_to_more_symbol_key" + latin:parentStyle="functionalKeyStyle" /> + <key-style + latin:styleName="backFromMoreSymbolKeyStyle" + latin:code="@integer/key_shift" + latin:keyLabel="@string/label_to_symbol_key" + latin:parentStyle="functionalKeyStyle" /> <switch> <case latin:passwordInput="true" diff --git a/java/res/xml/kbd_rows_symbols.xml b/java/res/xml/kbd_rows_symbols.xml index a8eeb3b91d89160634b7265ab93f2341aaf96bef..75e21a002f84f4707b39044c3394ba0f65915abb 100644 --- a/java/res/xml/kbd_rows_symbols.xml +++ b/java/res/xml/kbd_rows_symbols.xml @@ -95,7 +95,7 @@ latin:keyWidth="10%p" > <Key - latin:keyStyle="altKeyStyle" + latin:keyStyle="toMoreSymbolKeyStyle" latin:keyWidth="15%p" latin:visualInsetsRight="1%p" /> <Key diff --git a/java/res/xml/kbd_rows_symbols_shift.xml b/java/res/xml/kbd_rows_symbols_shift.xml index 0706cbc7874e60893662bd7304a4cd53a66f9d38..d5234151233889a85d28bf56c12da641ba73689d 100644 --- a/java/res/xml/kbd_rows_symbols_shift.xml +++ b/java/res/xml/kbd_rows_symbols_shift.xml @@ -91,7 +91,7 @@ latin:keyWidth="10%p" > <Key - latin:keyStyle="altKeyStyle" + latin:keyStyle="backFromMoreSymbolKeyStyle" latin:keyWidth="15%p" latin:visualInsetsRight="1%p" /> <Key