Clean up PC QWERTY keyboard
Change-Id: Ibb52683e8f27517b9e7bf398d3b7a31215bd5a8d
diff --git a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
index 1db6c35..324e025 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml
@@ -23,36 +23,32 @@
>
<switch>
<case
- latin:keyboardLayoutSetElement="symbols"
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<Key
latin:keyLabel="["
- latin:moreKeys="{" />
- <Key
- latin:keyLabel="]"
- latin:moreKeys="}" />
- <!-- U+00A6: "¦" BROKEN BAR -->
- <Key
- latin:keyLabel="\\"
- latin:moreKeys="\\|,¦" />
- </case>
- <default>
- <Key
- latin:keyLabel="["
latin:keyHintLabel="{"
- latin:moreKeys="{"
+ latin:additionalMoreKeys="{"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="]"
latin:keyHintLabel="}"
- latin:moreKeys="}"
+ latin:additionalMoreKeys="}"
latin:keyStyle="hasShiftedLetterHintStyle" />
- <!-- U+00A6: "¦" BROKEN BAR -->
<Key
latin:keyLabel="\\"
latin:keyHintLabel="|"
- latin:moreKeys="\\|,¦"
+ latin:additionalMoreKeys="\\|"
latin:keyStyle="hasShiftedLetterHintStyle" />
+ </case>
+ <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
+ <default>
+ <Key
+ latin:keyLabel="{" />
+ <Key
+ latin:keyLabel="}" />
+ <Key
+ latin:keyLabel="|" />
</default>
</switch>
-</merge>
+</merge>
\ No newline at end of file
diff --git a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
index b3882b6..254b5e5 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml
@@ -23,26 +23,27 @@
>
<switch>
<case
- latin:keyboardLayoutSetElement="symbols"
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
<Key
latin:keyLabel=";"
- latin:moreKeys=":" />
- <Key
- latin:keyLabel="\'"
- latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />
- </case>
- <default>
- <Key
- latin:keyLabel=";"
latin:keyHintLabel=":"
- latin:moreKeys=":"
+ latin:additionalMoreKeys=":"
latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="\'"
latin:keyHintLabel="""
- latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,",!text/single_quotes"
- latin:keyStyle="hasShiftedLetterHintStyle" />
+ latin:additionalMoreKeys="""
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!fixedColumnOrder!4,!text/double_quotes,%,!text/single_quotes" />
+ </case>
+ <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
+ <default>
+ <Key
+ latin:keyLabel=":" />
+ <Key
+ latin:keyLabel="""
+ latin:moreKeys="!fixedColumnOrder!3,!text/double_quotes,!text/single_quotes" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
index 13e95f5..774ff8d 100644
--- a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
+++ b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml
@@ -23,28 +23,26 @@
>
<switch>
<case
- latin:keyboardLayoutSetElement="symbols"
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
>
- <!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
- U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
- U+2264: "≤" LESS-THAN OR EQUAL TO
- U+2265: "≥" GREATER-THAN EQUAL TO
- U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
- U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
- <Key
+ <Key
latin:keyLabel=","
+ latin:keyHintLabel="<"
latin:additionalMoreKeys="<"
- latin:moreKeys="!fixedColumnOrder!4,‹,⁤,«" />
+ latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="."
+ latin:keyHintLabel=">"
latin:additionalMoreKeys=">"
- latin:moreKeys="!fixedColumnOrder!4,›,⁥,»" />
- <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
+ latin:keyStyle="hasShiftedLetterHintStyle" />
<Key
latin:keyLabel="/"
+ latin:keyHintLabel="\?"
latin:additionalMoreKeys="\?"
- latin:moreKeys="¿" />
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/more_keys_for_symbols_question" />
</case>
+ <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
<default>
<!-- U+2039: "‹" SINGLE LEFT-POINTING ANGLE QUOTATION MARK
U+203A: "›" SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
@@ -53,24 +51,14 @@
U+00AB: "«" LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
U+00BB: "»" RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK -->
<Key
- latin:keyLabel=","
- latin:keyHintLabel="<"
- latin:additionalMoreKeys="<"
- latin:moreKeys="!fixedColumnOrder!4,‹,≤,«"
- latin:keyStyle="hasShiftedLetterHintStyle" />
+ latin:keyLabel="<"
+ latin:moreKeys="!fixedColumnOrder!3,‹,≤,«" />
<Key
- latin:keyLabel="."
- latin:keyHintLabel=">"
- latin:additionalMoreKeys=">"
- latin:moreKeys="!fixedColumnOrder!4,›,≥,»"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <!-- U+00BF: "¿" INVERTED QUESTION MARK -->
+ latin:keyLabel=">"
+ latin:moreKeys="!fixedColumnOrder!3,›,≥,»" />
<Key
- latin:keyLabel="/"
- latin:keyHintLabel="\?"
- latin:additionalMoreKeys="\?"
- latin:moreKeys="¿"
- latin:keyStyle="hasShiftedLetterHintStyle" />
+ latin:keyLabel="\?"
+ latin:moreKeys="!text/more_keys_for_symbols_question" />
</default>
</switch>
</merge>
diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml
index 3c4a466..a79d2a8 100644
--- a/java/res/xml-sw600dp/row_pcqwerty5.xml
+++ b/java/res/xml-sw600dp/row_pcqwerty5.xml
@@ -38,9 +38,23 @@
latin:keyStyle="spaceKeyStyle"
latin:keyXPos="25.5%p"
latin:keyWidth="49.0%p" />
- <include
- latin:keyXPos="-9.0%p"
- latin:keyWidth="fillRight"
- latin:keyboardLayout="@xml/key_shortcut" />
+ <switch>
+ <case
+ latin:keyboardLayoutSetElement="alphabet|alphabetAutomaticShifted"
+ >
+ <include
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="9.0%p"
+ latin:keyboardLayout="@xml/key_shortcut" />
+ </case>
+ <!-- keyboardLayoutSetElement="alphabetManualShifted|alphabetShiftLocked|alphabetShiftLockShifted" -->
+ <default>
+ <include
+ latin:keyXPos="-9.0%p"
+ latin:keyWidth="9.0%p"
+ latin:backgroundType="functional"
+ latin:keyboardLayout="@xml/key_symbols_period" />
+ </default>
+ </switch>
</Row>
</merge>
diff --git a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
index d36582a..254d3fd 100644
--- a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
+++ b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml
@@ -21,93 +21,87 @@
<merge
xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
>
- <switch>
- <case
- latin:keyboardLayoutSetElement="symbols"
- >
- <include
- latin:keyboardLayout="@xml/keys_pcqwerty_symbols1" />
- </case>
- <!-- keyboardLayoutSetElement="alphabet*" -->
- <default>
- <!-- U+00AC: "¬" NOT SIGN -->
- <Key
- latin:keyLabel="`"
- latin:keyHintLabel="~"
- latin:additionalMoreKeys="~"
- latin:moreKeys="¬"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <!-- U+00A1: "¡" NVERTED EXCLAMATION MARK -->
- <Key
- latin:keyLabel="1"
- latin:keyHintLabel="!"
- latin:additionalMoreKeys="!"
- latin:moreKeys="¡,!text/more_keys_for_symbols_1"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="2"
- latin:keyHintLabel="\@"
- latin:additionalMoreKeys="\@"
- latin:moreKeys="!text/more_keys_for_symbols_2"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="3"
- latin:keyHintLabel="\#"
- latin:additionalMoreKeys="\#"
- latin:moreKeys="!text/more_keys_for_symbols_3"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="4"
- latin:keyHintLabel="$"
- latin:additionalMoreKeys="$"
- latin:moreKeys="!text/more_keys_for_symbols_4"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="5"
- latin:keyHintLabel="%"
- latin:additionalMoreKeys="\\%"
- latin:moreKeys="!text/more_keys_for_symbols_5"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="6"
- latin:keyHintLabel="^"
- latin:additionalMoreKeys="^"
- latin:moreKeys="!text/more_keys_for_symbols_6"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="7"
- latin:keyHintLabel="&"
- latin:additionalMoreKeys="&"
- latin:moreKeys="!text/more_keys_for_symbols_7"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="8"
- latin:keyHintLabel="*"
- latin:additionalMoreKeys="*"
- latin:moreKeys="!text/more_keys_for_symbols_8"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="9"
- latin:keyHintLabel="("
- latin:additionalMoreKeys="("
- latin:moreKeys="!text/more_keys_for_symbols_9"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="0"
- latin:keyHintLabel=")"
- latin:additionalMoreKeys=")"
- latin:moreKeys="!text/more_keys_for_symbols_0"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="-"
- latin:keyHintLabel="_"
- latin:moreKeys="_"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- <Key
- latin:keyLabel="="
- latin:keyHintLabel="+"
- latin:moreKeys="+"
- latin:keyStyle="hasShiftedLetterHintStyle" />
- </default>
- </switch>
+ <Key
+ latin:keyLabel="`"
+ latin:keyHintLabel="~"
+ latin:additionalMoreKeys="~"
+ latin:keyStyle="hasShiftedLetterHintStyle" />
+ <Key
+ latin:keyLabel="1"
+ latin:keyHintLabel="!"
+ latin:additionalMoreKeys="!"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/more_keys_for_symbols_exclamation,!text/more_keys_for_symbols_1" />
+ <Key
+ latin:keyLabel="2"
+ latin:keyHintLabel="\@"
+ latin:additionalMoreKeys="\@"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/more_keys_for_symbols_2" />
+ <Key
+ latin:keyLabel="3"
+ latin:keyHintLabel="\#"
+ latin:additionalMoreKeys="\#"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/more_keys_for_symbols_3" />
+ <Key
+ latin:keyLabel="4"
+ latin:keyHintLabel="$"
+ latin:additionalMoreKeys="$"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/more_keys_for_symbols_4" />
+ <Key
+ latin:keyLabel="5"
+ latin:keyHintLabel="%"
+ latin:additionalMoreKeys="\\%"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/more_keys_for_symbols_5" />
+ <Key
+ latin:keyLabel="6"
+ latin:keyHintLabel="^"
+ latin:additionalMoreKeys="^"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/more_keys_for_symbols_6" />
+ <Key
+ latin:keyLabel="7"
+ latin:keyHintLabel="&"
+ latin:additionalMoreKeys="&"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/more_keys_for_symbols_7" />
+ <Key
+ latin:keyLabel="8"
+ latin:keyHintLabel="*"
+ latin:additionalMoreKeys="*"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/more_keys_for_symbols_8" />
+ <Key
+ latin:keyLabel="9"
+ latin:keyHintLabel="("
+ latin:additionalMoreKeys="("
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="!text/more_keys_for_symbols_9" />
+ <Key
+ latin:keyLabel="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:keyLabel="-"
+ latin:keyHintLabel="_"
+ latin:additionalMoreKeys="_"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="–,—,·" />
+ <!-- U+221E: "∞" INFINITY
+ U+2260: "≠" NOT EQUAL TO
+ U+2248: "≈" ALMOST EQUAL TO -->
+ <Key
+ latin:keyLabel="="
+ latin:keyHintLabel="+"
+ latin:additionalMoreKeys="+"
+ latin:keyStyle="hasShiftedLetterHintStyle"
+ latin:moreKeys="∞,≠,≈" />
</merge>
diff --git a/java/res/xml-sw600dp/rows_pcqwerty.xml b/java/res/xml-sw600dp/rows_pcqwerty.xml
index fa6080a..8714815 100644
--- a/java/res/xml-sw600dp/rows_pcqwerty.xml
+++ b/java/res/xml-sw600dp/rows_pcqwerty.xml
@@ -26,8 +26,19 @@
<Row
latin:keyWidth="7.0%p"
>
- <include
- latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
+ <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>
<Key
latin:keyStyle="deleteKeyStyle"
latin:keyWidth="fillRight" />
@@ -44,9 +55,7 @@
<Row
latin:keyWidth="7.0%p"
>
- <Key
- latin:keyStyle="toSymbolKeyStyle"
- latin:keyLabel="!text/label_to_symbol_key_pcqwerty"
+ <Spacer
latin:keyWidth="12.0%p" />
<include
latin:keyboardLayout="@xml/rowkeys_pcqwerty3" />
diff --git a/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml b/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml
deleted file mode 100644
index e642704..0000000
--- a/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2012, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-** http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<merge
- xmlns:latin="http://schemas.android.com/apk/res/com.android.inputmethod.latin"
->
- <include
- latin:keyboardLayout="@xml/key_styles_common" />
- <Row
- latin:keyWidth="7.0%p"
- >
- <include
- latin:keyboardLayout="@xml/rowkeys_pcqwerty1" />
- <Key
- latin:keyStyle="deleteKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="7.0%p"
- >
- <Key
- latin:keyStyle="tabKeyStyle"
- latin:keyWidth="9.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_pcqwerty2" />
- </Row>
- <Row
- latin:keyWidth="7.0%p"
- >
- <Key
- latin:keyStyle="toAlphaKeyStyle"
- latin:keyWidth="12.0%p" />
- <include
- latin:keyboardLayout="@xml/rowkeys_pcqwerty3" />
- <Key
- latin:keyStyle="enterKeyStyle"
- latin:keyWidth="fillRight" />
- </Row>
- <Row
- latin:keyWidth="7.0%p"
- >
- <include
- latin:keyboardLayout="@xml/rowkeys_pcqwerty4"
- latin:keyXPos="15.0%p" />
- </Row>
- <include
- latin:keyboardLayout="@xml/row_pcqwerty5" />
-</merge>