diff --git a/java/res/values/donottranslate.xml b/java/res/values/donottranslate.xml index 37f073675..0be886015 100644 --- a/java/res/values/donottranslate.xml +++ b/java/res/values/donottranslate.xml @@ -154,6 +154,7 @@ azerty dvorak colemak + pcqwerty @@ -162,6 +163,7 @@ AZERTY Dvorak Colemak + PC @@ -170,6 +172,7 @@ %s (AZERTY) %s (Dvorak) %s (Colemak) + %s (PC) com.google.android.inputmethod.latin.dictionarypack diff --git a/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml new file mode 100644 index 000000000..0a27ca70c --- /dev/null +++ b/java/res/xml-sw600dp/keys_pcqwerty2_right3.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml new file mode 100644 index 000000000..a0e5cbb92 --- /dev/null +++ b/java/res/xml-sw600dp/keys_pcqwerty3_right2.xml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml new file mode 100644 index 000000000..ee5271abe --- /dev/null +++ b/java/res/xml-sw600dp/keys_pcqwerty4_right3.xml @@ -0,0 +1,76 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-sw600dp/row_pcqwerty5.xml b/java/res/xml-sw600dp/row_pcqwerty5.xml new file mode 100644 index 000000000..83bc83e69 --- /dev/null +++ b/java/res/xml-sw600dp/row_pcqwerty5.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml new file mode 100644 index 000000000..d486b9df0 --- /dev/null +++ b/java/res/xml-sw600dp/rowkeys_pcqwerty1.xml @@ -0,0 +1,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-sw600dp/rows_pcqwerty.xml b/java/res/xml-sw600dp/rows_pcqwerty.xml new file mode 100644 index 000000000..ff2f785ea --- /dev/null +++ b/java/res/xml-sw600dp/rows_pcqwerty.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml b/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml new file mode 100644 index 000000000..046bce909 --- /dev/null +++ b/java/res/xml-sw600dp/rows_pcqwerty_symbols.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-sw768dp/row_pcqwerty5.xml b/java/res/xml-sw768dp/row_pcqwerty5.xml new file mode 100644 index 000000000..e27ec878b --- /dev/null +++ b/java/res/xml-sw768dp/row_pcqwerty5.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-sw768dp/rows_pcqwerty.xml b/java/res/xml-sw768dp/rows_pcqwerty.xml new file mode 100644 index 000000000..c14fb12fe --- /dev/null +++ b/java/res/xml-sw768dp/rows_pcqwerty.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml-sw768dp/rows_pcqwerty_symbols.xml b/java/res/xml-sw768dp/rows_pcqwerty_symbols.xml new file mode 100644 index 000000000..faa9d8a2c --- /dev/null +++ b/java/res/xml-sw768dp/rows_pcqwerty_symbols.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/kbd_pcqwerty.xml b/java/res/xml/kbd_pcqwerty.xml new file mode 100644 index 000000000..cebca4ff7 --- /dev/null +++ b/java/res/xml/kbd_pcqwerty.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/java/res/xml/kbd_pcqwerty_symbols.xml b/java/res/xml/kbd_pcqwerty_symbols.xml new file mode 100644 index 000000000..fd64e5bf4 --- /dev/null +++ b/java/res/xml/kbd_pcqwerty_symbols.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/java/res/xml/key_styles_common.xml b/java/res/xml/key_styles_common.xml index 4341b7903..f0e9170e1 100644 --- a/java/res/xml/key_styles_common.xml +++ b/java/res/xml/key_styles_common.xml @@ -147,8 +147,8 @@ latin:keyIconPreview="!icon/tab_key_preview" /> + keyboard will have a shortcut key. That means we should use label_to_symbol_key label + and shortcut_for_label icon. --> + + + + + + + + + + diff --git a/java/res/xml/keys_pcqwerty2_right3.xml b/java/res/xml/keys_pcqwerty2_right3.xml new file mode 100644 index 000000000..2065e6b46 --- /dev/null +++ b/java/res/xml/keys_pcqwerty2_right3.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/keys_pcqwerty3_right2.xml b/java/res/xml/keys_pcqwerty3_right2.xml new file mode 100644 index 000000000..fd9d3b8b0 --- /dev/null +++ b/java/res/xml/keys_pcqwerty3_right2.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/keys_pcqwerty4_right3.xml b/java/res/xml/keys_pcqwerty4_right3.xml new file mode 100644 index 000000000..7795b3d8b --- /dev/null +++ b/java/res/xml/keys_pcqwerty4_right3.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/keys_pcqwerty_symbols1.xml b/java/res/xml/keys_pcqwerty_symbols1.xml new file mode 100644 index 000000000..bf48b1f17 --- /dev/null +++ b/java/res/xml/keys_pcqwerty_symbols1.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/keys_pcqwerty_symbols2.xml b/java/res/xml/keys_pcqwerty_symbols2.xml new file mode 100644 index 000000000..d0ea984e8 --- /dev/null +++ b/java/res/xml/keys_pcqwerty_symbols2.xml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/keys_pcqwerty_symbols3.xml b/java/res/xml/keys_pcqwerty_symbols3.xml new file mode 100644 index 000000000..35279deaf --- /dev/null +++ b/java/res/xml/keys_pcqwerty_symbols3.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/keys_pcqwerty_symbols4.xml b/java/res/xml/keys_pcqwerty_symbols4.xml new file mode 100644 index 000000000..3c628f0e0 --- /dev/null +++ b/java/res/xml/keys_pcqwerty_symbols4.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/row_pcqwerty5.xml b/java/res/xml/row_pcqwerty5.xml new file mode 100644 index 000000000..c9ee32c04 --- /dev/null +++ b/java/res/xml/row_pcqwerty5.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/rowkeys_pcqwerty1.xml b/java/res/xml/rowkeys_pcqwerty1.xml new file mode 100644 index 000000000..0ecda3550 --- /dev/null +++ b/java/res/xml/rowkeys_pcqwerty1.xml @@ -0,0 +1,87 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/rowkeys_pcqwerty2.xml b/java/res/xml/rowkeys_pcqwerty2.xml new file mode 100644 index 000000000..cedf47559 --- /dev/null +++ b/java/res/xml/rowkeys_pcqwerty2.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + diff --git a/java/res/xml/rowkeys_pcqwerty3.xml b/java/res/xml/rowkeys_pcqwerty3.xml new file mode 100644 index 000000000..5044e5feb --- /dev/null +++ b/java/res/xml/rowkeys_pcqwerty3.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + diff --git a/java/res/xml/rowkeys_pcqwerty4.xml b/java/res/xml/rowkeys_pcqwerty4.xml new file mode 100644 index 000000000..4071e8c09 --- /dev/null +++ b/java/res/xml/rowkeys_pcqwerty4.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + diff --git a/java/res/xml/rows_pcqwerty.xml b/java/res/xml/rows_pcqwerty.xml new file mode 100644 index 000000000..a5ed74518 --- /dev/null +++ b/java/res/xml/rows_pcqwerty.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/java/res/xml/rows_pcqwerty_symbols.xml b/java/res/xml/rows_pcqwerty_symbols.xml new file mode 100644 index 000000000..107a4ad1f --- /dev/null +++ b/java/res/xml/rows_pcqwerty_symbols.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java index cd3d3c0cb..1b516755f 100644 --- a/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java +++ b/java/src/com/android/inputmethod/keyboard/internal/KeyboardTextsSet.java @@ -234,6 +234,7 @@ public final class KeyboardTextsSet { /* 118 */ "label_to_phone_symbols_key", /* 119 */ "label_time_am", /* 120 */ "label_time_pm", + /* 121 */ "label_to_symbol_key_pcqwerty", }; private static final String EMPTY = ""; @@ -381,6 +382,8 @@ public final class KeyboardTextsSet { /* 119 */ "AM", // Key label for "post meridiem" /* 120 */ "PM", + // Label for "switch to symbols" key on PC QWERTY layout + /* 121 */ "Sym", }; /* Language ar: Arabic */ diff --git a/tools/maketext/res/values/donottranslate-more-keys.xml b/tools/maketext/res/values/donottranslate-more-keys.xml index 401613410..1acb8a169 100644 --- a/tools/maketext/res/values/donottranslate-more-keys.xml +++ b/tools/maketext/res/values/donottranslate-more-keys.xml @@ -201,4 +201,6 @@ "AM" "PM" + + Sym