Replace ALT/More with more meaningful key labels

bug: 5113471 Change-Id: I324d24ea28c0ff9246dde2494296dca1dddabb1b
2011-08-03 15:21:27 +09:00 · 2011-08-03 15:21:27 +09:00 · 09578c895d
parent 627427b42a
commit 09578c895d
14 changed files with 43 additions and 26 deletions
--- 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">= \\ &lt;</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! -->
--- 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"
--- 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="("
--- 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="("
--- 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="&lt;"
--- 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="\\" />
--- 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"
--- 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=","
--- 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=","
--- 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="&lt;"
@ -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>
--- 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>
--- 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"
--- 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
--- 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