Merge "Fix PC Qwerty shift locked layout"

main
Tadashi G. Takaoka 2014-03-20 09:39:42 +00:00 committed by Android (Google) Code Review
commit a13096db38
10 changed files with 172 additions and 172 deletions

View File

@ -23,7 +23,7 @@
>
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
latin:keySpec="["

View File

@ -23,7 +23,7 @@
>
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
latin:keySpec=";"

View File

@ -23,7 +23,7 @@
>
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
latin:keySpec=","

View File

@ -21,87 +21,98 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keySpec="`"
latin:keyHintLabel="~"
latin:additionalMoreKeys="~"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keySpec="1"
latin:keyHintLabel="!"
latin:additionalMoreKeys="!"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_exclamation,!text/more_keys_for_symbols_1" />
<Key
latin:keySpec="2"
latin:keyHintLabel="\@"
latin:additionalMoreKeys="\@"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_2" />
<Key
latin:keySpec="3"
latin:keyHintLabel="\#"
latin:additionalMoreKeys="\#"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_3" />
<Key
latin:keySpec="4"
latin:keyHintLabel="$"
latin:additionalMoreKeys="$"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_4" />
<Key
latin:keySpec="5"
latin:keyHintLabel="%"
latin:additionalMoreKeys="\\%"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_5" />
<Key
latin:keySpec="6"
latin:keyHintLabel="^"
latin:additionalMoreKeys="^"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_6" />
<Key
latin:keySpec="7"
latin:keyHintLabel="&amp;"
latin:additionalMoreKeys="&amp;"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_7" />
<Key
latin:keySpec="8"
latin:keyHintLabel="*"
latin:additionalMoreKeys="*"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_8" />
<Key
latin:keySpec="9"
latin:keyHintLabel="("
latin:additionalMoreKeys="("
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_9" />
<Key
latin:keySpec="0"
latin:keyHintLabel=")"
latin:additionalMoreKeys=")"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_0" />
<!-- U+2013: "" EN DASH
U+2014: "—" EM DASH
U+00B7: "·" MIDDLE DOT -->
<Key
latin:keySpec="-"
latin:keyHintLabel="_"
latin:additionalMoreKeys="_"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
<!-- U+221E: "∞" INFINITY
U+2260: "≠" NOT EQUAL TO
U+2248: "≈" ALMOST EQUAL TO -->
<Key
latin:keySpec="="
latin:keyHintLabel="+"
latin:additionalMoreKeys="+"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="&#x221E;,&#x2260;,&#x2248;" />
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
latin:keySpec="`"
latin:keyHintLabel="~"
latin:additionalMoreKeys="~"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keySpec="1"
latin:keyHintLabel="!"
latin:additionalMoreKeys="!"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_exclamation,!text/more_keys_for_symbols_1" />
<Key
latin:keySpec="2"
latin:keyHintLabel="\@"
latin:additionalMoreKeys="\@"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_2" />
<Key
latin:keySpec="3"
latin:keyHintLabel="\#"
latin:additionalMoreKeys="\#"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_3" />
<Key
latin:keySpec="4"
latin:keyHintLabel="$"
latin:additionalMoreKeys="$"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_4" />
<Key
latin:keySpec="5"
latin:keyHintLabel="%"
latin:additionalMoreKeys="\\%"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_5" />
<Key
latin:keySpec="6"
latin:keyHintLabel="^"
latin:additionalMoreKeys="^"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_6" />
<Key
latin:keySpec="7"
latin:keyHintLabel="&amp;"
latin:additionalMoreKeys="&amp;"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_7" />
<Key
latin:keySpec="8"
latin:keyHintLabel="*"
latin:additionalMoreKeys="*"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_8" />
<Key
latin:keySpec="9"
latin:keyHintLabel="("
latin:additionalMoreKeys="("
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_9" />
<Key
latin:keySpec="0"
latin:keyHintLabel=")"
latin:additionalMoreKeys=")"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="!text/more_keys_for_symbols_0" />
<!-- U+2013: "" EN DASH
U+2014: "—" EM DASH
U+00B7: "·" MIDDLE DOT -->
<Key
latin:keySpec="-"
latin:keyHintLabel="_"
latin:additionalMoreKeys="_"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
<!-- U+221E: "∞" INFINITY
U+2260: "≠" NOT EQUAL TO
U+2248: "≈" ALMOST EQUAL TO -->
<Key
latin:keySpec="="
latin:keyHintLabel="+"
latin:additionalMoreKeys="+"
latin:keyStyle="hasShiftedLetterHintStyle"
latin:moreKeys="&#x221E;,&#x2260;,&#x2248;" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
</default>
</switch>
</merge>

View File

@ -26,19 +26,8 @@
<Row
latin:keyWidth="7.0%p"
>
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
</default>
</switch>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />

View File

@ -23,7 +23,7 @@
>
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
latin:keySpec="["

View File

@ -23,7 +23,7 @@
>
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
latin:keySpec=";"

View File

@ -23,7 +23,7 @@
>
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
latin:keySpec=","

View File

@ -21,61 +21,72 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
<Key
latin:keySpec="`"
latin:additionalMoreKeys="~" />
<Key
latin:keySpec="1"
latin:additionalMoreKeys="!,!text/more_keys_for_exclamation"
latin:moreKeys="!text/more_keys_for_symbols_1" />
<Key
latin:keySpec="2"
latin:additionalMoreKeys="\@"
latin:moreKeys="!text/more_keys_for_symbols_2" />
<Key
latin:keySpec="3"
latin:additionalMoreKeys="\#"
latin:moreKeys="!text/more_keys_for_symbols_3" />
<Key
latin:keySpec="4"
latin:additionalMoreKeys="$"
latin:moreKeys="!text/more_keys_for_symbols_4" />
<Key
latin:keySpec="5"
latin:additionalMoreKeys="\\%"
latin:moreKeys="!text/more_keys_for_symbols_5" />
<Key
latin:keySpec="6"
latin:additionalMoreKeys="^"
latin:moreKeys="!text/more_keys_for_symbols_6" />
<Key
latin:keySpec="7"
latin:additionalMoreKeys="&amp;"
latin:moreKeys="!text/more_keys_for_symbols_7" />
<Key
latin:keySpec="8"
latin:additionalMoreKeys="*"
latin:moreKeys="!text/more_keys_for_symbols_8" />
<Key
latin:keySpec="9"
latin:additionalMoreKeys="("
latin:moreKeys="!text/more_keys_for_symbols_9" />
<Key
latin:keySpec="0"
latin:additionalMoreKeys=")"
latin:moreKeys="!text/more_keys_for_symbols_0" />
<!-- U+2013: "" EN DASH
U+2014: "—" EM DASH
U+00B7: "·" MIDDLE DOT -->
<Key
latin:keySpec="-"
latin:additionalMoreKeys="_"
latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
<!-- U+221E: "∞" INFINITY
U+2260: "≠" NOT EQUAL TO
U+2248: "≈" ALMOST EQUAL TO -->
<Key
latin:keySpec="="
latin:additionalMoreKeys="+"
latin:moreKeys="!fixedColumnOrder!4,&#x221E;,&#x2260;,&#x2248;,%" />
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted|alphabetShiftLocked"
>
<Key
latin:keySpec="`"
latin:additionalMoreKeys="~" />
<Key
latin:keySpec="1"
latin:additionalMoreKeys="!,!text/more_keys_for_exclamation"
latin:moreKeys="!text/more_keys_for_symbols_1" />
<Key
latin:keySpec="2"
latin:additionalMoreKeys="\@"
latin:moreKeys="!text/more_keys_for_symbols_2" />
<Key
latin:keySpec="3"
latin:additionalMoreKeys="\#"
latin:moreKeys="!text/more_keys_for_symbols_3" />
<Key
latin:keySpec="4"
latin:additionalMoreKeys="$"
latin:moreKeys="!text/more_keys_for_symbols_4" />
<Key
latin:keySpec="5"
latin:additionalMoreKeys="\\%"
latin:moreKeys="!text/more_keys_for_symbols_5" />
<Key
latin:keySpec="6"
latin:additionalMoreKeys="^"
latin:moreKeys="!text/more_keys_for_symbols_6" />
<Key
latin:keySpec="7"
latin:additionalMoreKeys="&amp;"
latin:moreKeys="!text/more_keys_for_symbols_7" />
<Key
latin:keySpec="8"
latin:additionalMoreKeys="*"
latin:moreKeys="!text/more_keys_for_symbols_8" />
<Key
latin:keySpec="9"
latin:additionalMoreKeys="("
latin:moreKeys="!text/more_keys_for_symbols_9" />
<Key
latin:keySpec="0"
latin:additionalMoreKeys=")"
latin:moreKeys="!text/more_keys_for_symbols_0" />
<!-- U+2013: "" EN DASH
U+2014: "—" EM DASH
U+00B7: "·" MIDDLE DOT -->
<Key
latin:keySpec="-"
latin:additionalMoreKeys="_"
latin:moreKeys="&#x2013;,&#x2014;,&#x00B7;" />
<!-- U+221E: "∞" INFINITY
U+2260: "≠" NOT EQUAL TO
U+2248: "≈" ALMOST EQUAL TO -->
<Key
latin:keySpec="="
latin:additionalMoreKeys="+"
latin:moreKeys="!fixedColumnOrder!4,&#x221E;,&#x2260;,&#x2248;,%" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLockShifted" -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
</default>
</switch>
</merge>

View File

@ -26,19 +26,8 @@
<Row
latin:keyWidth="7.692%p"
>
<switch>
<case
latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
</case>
<!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1_shift" />
</default>
</switch>
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
</Row>
<Row
latin:keyWidth="7.692%p"